From 0532a5fe992b1dab2cceb7e5d5a5c1fb76464aef Mon Sep 17 00:00:00 2001 From: "T.Aoyama" Date: Mon, 19 Aug 2024 12:24:43 +0900 Subject: [PATCH 1/3] update workflow script --- .github/workflows/main.yml | 5 +---- config/apple.cmake | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b49b05fe..4c23a9fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/config/apple.cmake b/config/apple.cmake index 7467c52f..37a7a290 100644 --- a/config/apple.cmake +++ b/config/apple.cmake @@ -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() From 4bdc71d745d588ce7aff59e021670f415e773bd8 Mon Sep 17 00:00:00 2001 From: "T.Aoyama" Date: Mon, 19 Aug 2024 15:40:59 +0900 Subject: [PATCH 2/3] update workflow script for macos-lateset --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c23a9fe..27f7dbfb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,7 @@ jobs: run: | if [ ${{ runner.os }} = "macOS" ] ; then # CONFIG=apple requires gfortran but macOS runner has not, but gfortran-11, 12, ... - cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=gfortran-14 $GITHUB_WORKSPACE + cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=gfortran-14 -DCMAKE_AR=/usr/bin/ar $GITHUB_WORKSPACE else cmake -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE fi From e7ad18c18d7f3b7f1d63fbb4e2694184768a2ec1 Mon Sep 17 00:00:00 2001 From: "T.Aoyama" Date: Mon, 19 Aug 2024 17:46:36 +0900 Subject: [PATCH 3/3] update workflow script for macos-latest --- .github/workflows/main.yml | 4 ++-- CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27f7dbfb..2766cdd0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -52,7 +52,7 @@ jobs: run: | if [ ${{ runner.os }} = "macOS" ] ; then # CONFIG=apple requires gfortran but macOS runner has not, but gfortran-11, 12, ... - cmake -DCONFIG=apple -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=gfortran-14 -DCMAKE_AR=/usr/bin/ar $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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3257d79d..4308c5da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)