From 80f1ebe9656c0353cb3f2b703efe8aa499009f3d Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 7 Aug 2024 16:52:55 -0400 Subject: [PATCH 1/6] Fix serialization example --- c++/app4triqs/app4triqs.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/app4triqs/app4triqs.hpp b/c++/app4triqs/app4triqs.hpp index b92d513b..f9663000 100644 --- a/c++/app4triqs/app4triqs.hpp +++ b/c++/app4triqs/app4triqs.hpp @@ -59,7 +59,7 @@ namespace app4triqs { friend void h5_read(h5::group grp, std::string subgroup_name, toto &m); /// Serialization - template void serialize(Archive &ar, const unsigned int) { ar &i; } + template void serialize(Archive &ar) { ar &i; } }; /** From 6e2428ef200d89e3d672c5391fa4d61e25c65de5 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 13 Aug 2024 17:33:13 -0400 Subject: [PATCH 2/6] [cmake] Update Cpp2Py branch to main and bump version req --- deps/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e26dfbae..392370c1 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -51,8 +51,8 @@ endif() if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation)) external_dependency(Cpp2Py GIT_REPO https://github.com/TRIQS/cpp2py - VERSION 2.0 - GIT_TAG unstable + VERSION 3.3 + GIT_TAG main BUILD_ALWAYS EXCLUDE_FROM_ALL ) From 71dc824780f7b258750edc8638b356f3afe44b16 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 14 Aug 2024 16:52:17 -0400 Subject: [PATCH 3/6] Update example API to include serialization function --- c++/app4triqs/app4triqs.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/c++/app4triqs/app4triqs.hpp b/c++/app4triqs/app4triqs.hpp index f9663000..d7ce7fc1 100644 --- a/c++/app4triqs/app4triqs.hpp +++ b/c++/app4triqs/app4triqs.hpp @@ -59,7 +59,8 @@ namespace app4triqs { friend void h5_read(h5::group grp, std::string subgroup_name, toto &m); /// Serialization - template void serialize(Archive &ar) { ar &i; } + void serialize(auto &ar) const { ar &i; } + void deserialize(auto &ar) { ar &i; } }; /** From b07a3de46c80cbd03f8d01c5480dcc00b00c8732 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 5 Sep 2024 15:35:06 -0400 Subject: [PATCH 4/6] [jenkins] For osx builds use gcc14 and python 3.12 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff81d637..4a5f979f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,8 +58,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) { /****************** osx builds (on host) */ def osxPlatforms = [ - ["gcc", ['CC=gcc-13', 'CXX=g++-13', 'FC=gfortran-13']], - ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-13', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] + ["gcc", ['CC=gcc-14', 'CXX=g++-14', 'FC=gfortran-14']], + ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-14', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] ] for (int i = 0; i < osxPlatforms.size(); i++) { def platformEnv = osxPlatforms[i] @@ -87,7 +87,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { "CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include", "LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib", "LD_LIBRARY_PATH=$hdf5/lib", - "PYTHONPATH=$installDir/lib/python3.9/site-packages", + "PYTHONPATH=$installDir/lib/python3.12/site-packages", "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs", "VIRTUAL_ENV=$venv", "OMP_NUM_THREADS=2"]) { From bbd45fb1231eec26cf0347d3b0054fde388f09ea Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 6 Sep 2024 11:58:48 -0400 Subject: [PATCH 5/6] [cmake] Set cmake policies to current cmake version --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dca0f459..8033c5ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,10 +20,7 @@ # ############################################################################## cmake_minimum_required(VERSION 3.20 FATAL_ERROR) -cmake_policy(VERSION 3.20) -if(POLICY CMP0144) - cmake_policy(SET CMP0144 NEW) -endif() +cmake_policy(VERSION ${CMAKE_VERSION}) # ############ # Define Project From 6e48818d2fecbfae8e2fb5c187d0a98e29ca7a8e Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 9 Sep 2024 11:10:54 -0400 Subject: [PATCH 6/6] [jenkins] Synchronize jenkinsfile with triqs --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4a5f979f..00ed5be2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -86,7 +86,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { "C_INCLUDE_PATH=$hdf5/include:${env.BREW}/include", "CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include", "LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib", - "LD_LIBRARY_PATH=$hdf5/lib", + "DYLD_LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib", "PYTHONPATH=$installDir/lib/python3.12/site-packages", "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs", "VIRTUAL_ENV=$venv",