Skip to content

Commit 0df5928

Browse files
authored
Fix CI, update QCEl 0.29, QCEn 0.31, and Einsums 0.6.1 (psi4#3262)
* Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update codedeps.yaml * Update CMakeLists.txt * Update ecosystem.yml * Update test_input.py * Update test_input.py * Update ecosystem.yml
1 parent 1869a5f commit 0df5928

File tree

8 files changed

+11
-8
lines changed

8 files changed

+11
-8
lines changed

.github/workflows/ecosystem.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ jobs:
165165
:
166166
# not for py312
167167
sed -i "s;- cppe;#- cppe;g" env_p4build.yaml
168+
sed -i "s;- qcfractal;- qcfractal>=0.59;g" env_p4build.yaml
168169
fi
169170
if [[ "${{ runner.os }}" == "macOS" && "${{ matrix.cfg.label }}" == "Conda Clang (M-Intel)" ]]; then
170171
:

codedeps.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,8 @@ data:
11341134
conda:
11351135
channel: conda-forge
11361136
name: i-pi
1137-
constraint: null
1137+
constraint: "==3.1.0"
1138+
constraint_note: "Higher requires ASE be installed."
11381139
cmake: null
11391140
cmake_note: "Primarily OTF runtime detected."
11401141

external/upstream/einsums/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(${ENABLE_Einsums})
2-
find_package(Einsums 0.5 CONFIG)
2+
find_package(Einsums 0.6 CONFIG)
33

44
if(TARGET Einsums::einsums)
55
get_property(_loc TARGET Einsums::einsums PROPERTY LOCATION)
@@ -32,7 +32,7 @@ if(${ENABLE_Einsums})
3232
ExternalProject_Add(einsums_external
3333
DEPENDS lapack_external
3434
hdf5_external
35-
URL https://github.com/Einsums/Einsums/archive/v0.5.tar.gz
35+
URL https://github.com/Einsums/Einsums/archive/v0.6.1.tar.gz
3636
UPDATE_COMMAND ""
3737
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
3838
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

external/upstream/qcelemental/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else()
2727

2828
ExternalProject_Add(qcelemental_external
2929
BUILD_ALWAYS 1
30-
URL https://github.com/MolSSI/QCElemental/archive/v0.28.0.tar.gz
30+
URL https://github.com/MolSSI/QCElemental/archive/v0.29.0.tar.gz
3131
DOWNLOAD_NO_EXTRACT 1
3232
CONFIGURE_COMMAND ""
3333
UPDATE_COMMAND ""

external/upstream/qcengine/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ else()
3838
ExternalProject_Add(qcengine_external
3939
DEPENDS qcelemental_external
4040
BUILD_ALWAYS 1
41-
URL https://github.com/MolSSI/QCEngine/archive/v0.30.0.tar.gz
41+
URL https://github.com/MolSSI/QCEngine/archive/v0.31.0.tar.gz
4242
DOWNLOAD_NO_EXTRACT 1
4343
CONFIGURE_COMMAND ""
4444
UPDATE_COMMAND ""

psi4/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ else()
135135
endif()
136136

137137
if(${ENABLE_Einsums})
138-
find_package(Einsums 0.5 CONFIG REQUIRED)
138+
find_package(Einsums 0.6 CONFIG REQUIRED)
139139
get_property(_loc TARGET Einsums::einsums PROPERTY LOCATION)
140140
list(APPEND _addons ${_loc})
141141
message(STATUS "${Cyan}Using Einsums${ColourReset}: ${_loc} (version ${Einsums_VERSION})")
@@ -265,6 +265,7 @@ if(MSVC)
265265
_CRT_NONSTDC_NO_DEPRECATE
266266
_CRT_NONSTDC_NO_WARNINGS
267267
_CRT_SECURE_NO_WARNINGS
268+
_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH
268269
)
269270
# Set the exception handling model
270271
add_compile_options("/EHsc")

tests/cbs-xtpl-wrapper/test_input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@ctest_labeler("cbs")
55
@pytest.mark.parametrize("distributed", [
66
pytest.param(False, id="internal"),
7-
pytest.param(True, id="snowflake", marks=using("qcfractal_next")),
7+
pytest.param(True, id="snowflake", marks=[*using("qcfractal_next"), pytest.mark.medlong]),
88
])
99
def test_cbs_xtpl_wrapper(distributed):
1010
setenv = ["_PSI4_USE_QCF"] if distributed else None

tests/nbody-multi-level/test_input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@ctest_labeler("nbody;extern")
55
@pytest.mark.parametrize("distributed", [
66
pytest.param(False, id="internal"),
7-
pytest.param(True, id="snowflake", marks=using("qcfractal_next")),
7+
pytest.param(True, id="snowflake", marks=[*using("qcfractal_next"), pytest.mark.medlong]),
88
])
99
def test_nbody_multi_level(distributed):
1010
setenv = ["_PSI4_USE_QCF"] if distributed else None

0 commit comments

Comments
 (0)