Skip to content

Commit

Permalink
Merge pull request #59 from aoymt/fix_workflow
Browse files Browse the repository at this point in the history
Fix workflow for macos target
  • Loading branch information
k-ido authored Sep 15, 2024
2 parents e6b8c48 + e7ad18c commit 9bca448
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: brew
if: ${{ runner.os == 'macOS' }}
run: |
brew install openmpi scalapack libomp
brew install openmpi scalapack libomp blis
- name: Setup Python
uses: actions/setup-python@v5
Expand All @@ -52,13 +52,10 @@ jobs:
run: |
if [ ${{ runner.os }} = "macOS" ] ; then
# CONFIG=apple requires gfortran but macOS runner has not, but gfortran-11, 12, ...
ln -s `which gfortran-11` gfortran
env PATH=`pwd`:$PATH cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE
cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=gfortran-14 $GITHUB_WORKSPACE
else
cmake -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE
fi
env:
HOMEBREW_PREFIX: /opt/homebrew
- name: build
working-directory: ${{runner.workspace}}/build
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(mVMC NONE)

option(USE_SCALAPACK "Use Scalapack" OFF)
Expand Down
2 changes: 1 addition & 1 deletion config/apple.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# additional libomp and gfortran installation required
# mac computers are suggested to use this configuration for better performance

if(NOT $ENV{HOMEBREW_PREFIX})
if(NOT DEFINED ENV{HOMEBREW_PREFIX})
message(FATAL "Homebrew is not installed. Please install Homebrew first.")
endif()

Expand Down

0 comments on commit 9bca448

Please sign in to comment.