Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Inject slug/short variables
uses: rlespinasse/github-slug-action@v4.x
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ jobs:

strategy:
matrix:
os: ["ubuntu-22.04", "ubuntu-20.04", "macos-latest"]
os: ["ubuntu-latest", "macos-latest"]
ompsize: [1, 4]
exclude:
- os: "macos-latest"
ompsize: 4 # OMP on macOS is too slow
fail-fast: false

env:
OMP_NUM_THREADS: ${{ matrix.ompsize }}

Expand Down
9 changes: 6 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5...3.10)
project(mVMC NONE)

# Make submodule packages with old cmake available from CMake4.0 or later.
set(CMAKE_POLICY_VERSION_MINIMUM 3.10)

option(USE_SCALAPACK "Use Scalapack" OFF)
option(PFAFFIAN_BLOCKED "Use blocked-update Pfaffian to speed up." OFF)
option(USE_GEMMT "Use GEMMT. Recommended regardless blocked-Pfaffian-update." ON)
Expand Down Expand Up @@ -40,7 +43,7 @@ endif()
if(CMAKE_C_COMPILER_ID STREQUAL "Intel")
# TODO: Really needs separation?
if("${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528")
set(OMP_FLAG_Intel "-openmp")
set(OMP_FLAG_Intel "-openmp")
else()
set(OMP_FLAG_Intel "-qopenmp")
endif()
Expand All @@ -51,7 +54,7 @@ else()
if(OPENMP_FOUND)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
endif(OPENMP_FOUND)
endif(OPENMP_FOUND)
endif()

find_package(MPI)
Expand Down
2 changes: 0 additions & 2 deletions src/ComplexUHF/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# include guard
cmake_minimum_required(VERSION 2.8.0 )

if(${CMAKE_PROJECT_NAME} STREQUAL "Project")
message(FATAL_ERROR "cmake should be executed not for 'src' subdirectory, but for the top directory of UHF.")
endif(${CMAKE_PROJECT_NAME} STREQUAL "Project")
Expand Down
2 changes: 0 additions & 2 deletions src/ltl2inv/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# include guard
cmake_minimum_required(VERSION 2.8.0 )

if(${CMAKE_PROJECT_NAME} STREQUAL "Project")
message(FATAL_ERROR "cmake should be executed not for 'src' subdirectory, but for the top directory of mVMC.")
endif(${CMAKE_PROJECT_NAME} STREQUAL "Project")
Expand Down
4 changes: 1 addition & 3 deletions src/mVMC/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# include guard
cmake_minimum_required(VERSION 2.8.0 )

add_definitions(-D_mVMC)
# include guard
if(${CMAKE_PROJECT_NAME} STREQUAL "Project")
message(FATAL_ERROR "cmake should be executed not for 'src' subdirectory, but for the top directory of mVMC.")
endif(${CMAKE_PROJECT_NAME} STREQUAL "Project")
Expand Down
2 changes: 0 additions & 2 deletions src/pfupdates/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# include guard
cmake_minimum_required(VERSION 2.8.0 )

if(${CMAKE_PROJECT_NAME} STREQUAL "Project")
message(FATAL_ERROR "cmake should be executed not for 'src' subdirectory, but for the top directory of mVMC.")
endif(${CMAKE_PROJECT_NAME} STREQUAL "Project")
Expand Down
3 changes: 3 additions & 0 deletions test/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ function(add_python_uhf_test model)
set_tests_properties(${model} PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/test/python")
endfunction(add_python_uhf_test)

# Suppress warnings about PythonInterp package.
# TODO: replace it with find_package(Python3 REQUIRED
cmake_policy(SET CMP0148 OLD)
find_package(PythonInterp 3.6 REQUIRED)

set(python_test_vmc_model
Expand Down
4 changes: 1 addition & 3 deletions tool/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# include guard
cmake_minimum_required(VERSION 2.8.0 )

add_definitions(-D_mVMC)
# include guard
if(${CMAKE_PROJECT_NAME} STREQUAL "Project")
message(FATAL_ERROR "cmake should be executed not for 'src' subdirectory, but for the top directory of mVMC.")
endif(${CMAKE_PROJECT_NAME} STREQUAL "Project")
Expand Down
Loading