wip

Cantera · Oct 12, 2024 · ead1403 · ead1403
1 parent 47877d0
commit ead1403
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 91 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,18 +6,18 @@ include(ExternalProject)
 
 set(DOWNLOAD_DIR "/cache")
 
-set(BOOST_VERSION 1.86.0)
-ExternalProject_Add(
-    boost
-    URL https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-cmake.tar.xz
-    URL_HASH SHA256=2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
-    CMAKE_GENERATOR Ninja
-    CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DCMAKE_INSTALL_LIBDIR:STRING=lib
-        -DBOOST_INCLUDE_LIBRARIES:STRING=algorithm;dll;stacktrace;core;math;numeric/ublas;serialization;multi_array
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-)
+# set(BOOST_VERSION 1.86.0)
+# ExternalProject_Add(
+#     boost
+#     URL https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-cmake.tar.xz
+#     URL_HASH SHA256=2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
+#     CMAKE_GENERATOR Ninja
+#     CMAKE_CACHE_ARGS
+#         -DCMAKE_BUILD_TYPE:STRING=Release
+#         -DCMAKE_INSTALL_LIBDIR:STRING=lib
+#         -DBOOST_INCLUDE_LIBRARIES:STRING=algorithm;dll;stacktrace;core;math;numeric/ublas;serialization;multi_array
+#     DOWNLOAD_DIR ${DOWNLOAD_DIR}
+# )
 
 set(LIBAEC_VERSION 1.1.3)
 set(LIBAEC_PATCHFILE)
@@ -35,99 +35,99 @@ ExternalProject_Add(
 )
 
 set(LIBHDF5_VERSION 1.14.5)
-string(REPLACE "." "_" LIBHDF5_UNDERSCORE_VERSION ${LIBHDF5_VERSION})
-string(REGEX REPLACE "([0-9]+)\.([0-9]+).[0-9]+" "v\\1_\\2" LIBHDF5_SHORT_VERSION ${LIBHDF5_VERSION})
 ExternalProject_Add(
     libhdf5
-    URL https://support.hdfgroup.org/releases/hdf5/${LIBHDF5_SHORT_VERSION}/v${LIBHDF5_UNDERSCORE_VERSION}/downloads/hdf5-${LIBHDF5_VERSION}.tar.gz
+    URL https://github.com/HDFGroup/hdf5/releases/download/hdf5_${LIBHDF5_VERSION}/hdf5-${LIBHDF5_VERSION}.tar.gz
     URL_HASH SHA256=ec2e13c52e60f9a01491bb3158cb3778c985697131fc6a342262d32a26e58e44
     CMAKE_GENERATOR Ninja
     CMAKE_CACHE_ARGS
         -DCMAKE_BUILD_TYPE:STRING=Release
         -DCMAKE_INSTALL_PREFIX:STRING=/usr/local
         -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON
         -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON
+        -DHDF5_USE_LIBAEC_STATIC:BOOL=ON
         -DHDF5_BUILD_EXAMPLES:BOOL=OFF
+        -DHDF5_BUILD_TOOLS:BOOL=OFF
         -DBUILD_TESTING:BOOL=OFF
     DEPENDS libaec
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
 )
 
-set(EIGEN_VERSION 3.4.0)
-ExternalProject_Add(
-    eigen
-    URL https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_VERSION}/eigen-${EIGEN_VERSION}.tar.bz2
-    URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626
-    CMAKE_GENERATOR Ninja
-    CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DEIGEN_BUILD_DOC:BOOL=OFF
-        -DBUILD_TESTING:BOOL=OFF
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-)
+# set(EIGEN_VERSION 3.4.0)
+# ExternalProject_Add(
+#     eigen
+#     URL https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_VERSION}/eigen-${EIGEN_VERSION}.tar.bz2
+#     URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626
+#     CMAKE_GENERATOR Ninja
+#     CMAKE_CACHE_ARGS
+#         -DCMAKE_BUILD_TYPE:STRING=Release
+#         -DEIGEN_BUILD_DOC:BOOL=OFF
+#         -DBUILD_TESTING:BOOL=OFF
+#     DOWNLOAD_DIR ${DOWNLOAD_DIR}
+# )
 
-set(YAML_CPP_VERSION 0.8.0)
-ExternalProject_Add(
-    yamlcpp
-    URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.tar.gz
-    URL_HASH SHA256=fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16
-    CMAKE_GENERATOR Ninja
-    CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DCMAKE_INSTALL_LIBDIR:STRING=lib
-        -DYAML_CPP_DISABLE_UNINSTALL:BOOL=OFF
-        -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF
-        -DBUILD_TESTING:BOOL=OFF
-        -DBUILD_SHARED_LIBS:BOOL=ON
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-)
+# set(YAML_CPP_VERSION 0.8.0)
+# ExternalProject_Add(
+#     yamlcpp
+#     URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.tar.gz
+#     URL_HASH SHA256=fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16
+#     CMAKE_GENERATOR Ninja
+#     CMAKE_CACHE_ARGS
+#         -DCMAKE_BUILD_TYPE:STRING=Release
+#         -DCMAKE_INSTALL_LIBDIR:STRING=lib
+#         -DYAML_CPP_DISABLE_UNINSTALL:BOOL=OFF
+#         -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF
+#         -DBUILD_TESTING:BOOL=OFF
+#         -DBUILD_SHARED_LIBS:BOOL=ON
+#     DOWNLOAD_DIR ${DOWNLOAD_DIR}
+# )
 
-set(SUNDIALS_VERSION 7.0.0)
-ExternalProject_Add(
-    sundials
-    URL https://github.com/LLNL/sundials/releases/download/v${SUNDIALS_VERSION}/sundials-${SUNDIALS_VERSION}.tar.gz
-    URL_HASH SHA256=d762a7950ef4097fbe9d289f67a8fb717a0b9f90f87ed82170eb5c36c0a07989
-    CMAKE_GENERATOR Ninja
-    CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DCMAKE_INSTALL_LIBDIR:STRING=lib
-        -DBUILD_SHARED_LIBS:BOOL=OFF
-        -DEXAMPLES_ENABLE_C:BOOL=OFF
-        -DEXAMPLES_INSTALL:BOOL=OFF
-        -DENABLE_LAPACK:BOOL=ON
-        -DBLA_VENDOR:STRING=OpenBLAS
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-)
+# set(SUNDIALS_VERSION 7.0.0)
+# ExternalProject_Add(
+#     sundials
+#     URL https://github.com/LLNL/sundials/releases/download/v${SUNDIALS_VERSION}/sundials-${SUNDIALS_VERSION}.tar.gz
+#     URL_HASH SHA256=d762a7950ef4097fbe9d289f67a8fb717a0b9f90f87ed82170eb5c36c0a07989
+#     CMAKE_GENERATOR Ninja
+#     CMAKE_CACHE_ARGS
+#         -DCMAKE_BUILD_TYPE:STRING=Release
+#         -DCMAKE_INSTALL_LIBDIR:STRING=lib
+#         -DBUILD_SHARED_LIBS:BOOL=OFF
+#         -DEXAMPLES_ENABLE_C:BOOL=OFF
+#         -DEXAMPLES_INSTALL:BOOL=OFF
+#         -DENABLE_LAPACK:BOOL=ON
+#         -DBLA_VENDOR:STRING=OpenBLAS
+#     DOWNLOAD_DIR ${DOWNLOAD_DIR}
+# )
 
-set(FMT_VERSION 10.2.1)
-ExternalProject_Add(
-    fmt
-    URL https://github.com/fmtlib/fmt/releases/download/${FMT_VERSION}/fmt-${FMT_VERSION}.zip
-    URL_HASH SHA256=312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9
-    CMAKE_GENERATOR Ninja
-    CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DCMAKE_INSTALL_LIBDIR:STRING=lib
-        -DFMT_DOC:BOOL=OFF
-        -DFMT_TEST:BOOL=OFF
-        -DBUILD_SHARED_LIBS:BOOL=ON
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-)
+# set(FMT_VERSION 10.2.1)
+# ExternalProject_Add(
+#     fmt
+#     URL https://github.com/fmtlib/fmt/releases/download/${FMT_VERSION}/fmt-${FMT_VERSION}.zip
+#     URL_HASH SHA256=312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9
+#     CMAKE_GENERATOR Ninja
+#     CMAKE_CACHE_ARGS
+#         -DCMAKE_BUILD_TYPE:STRING=Release
+#         -DCMAKE_INSTALL_LIBDIR:STRING=lib
+#         -DFMT_DOC:BOOL=OFF
+#         -DFMT_TEST:BOOL=OFF
+#         -DBUILD_SHARED_LIBS:BOOL=ON
+#     DOWNLOAD_DIR ${DOWNLOAD_DIR}
+# )
 
-set(HIGHFIVE_VERSION 2.10.0)
-ExternalProject_Add(
-    highfive
-    URL https://github.com/BlueBrain/HighFive/archive/refs/tags/v${HIGHFIVE_VERSION}.tar.gz
-    URL_HASH SHA256=c29e8e1520e7298fabb26545f804e35bb3af257005c1c2df62e39986458d7c38
-    CMAKE_GENERATOR Ninja
-    CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DHIGHFIVE_UNIT_TESTS:BOOL=OFF
-        -DHIGHFIVE_USE_BOOST:BOOL=ON
-        -DHIGHFIVE_USE_EIGEN:BOOL=ON
-        -DHIGHFIVE_EXAMPLES:BOOL=OFF
-        -DHIGHFIVE_BUILD_DOCS:BOOL=OFF
-        -DBoost_NO_BOOST_CMAKE:BOOL=OFF
-    DEPENDS boost eigen libhdf5
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-)
+# set(HIGHFIVE_VERSION 2.10.0)
+# ExternalProject_Add(
+#     highfive
+#     URL https://github.com/BlueBrain/HighFive/archive/refs/tags/v${HIGHFIVE_VERSION}.tar.gz
+#     URL_HASH SHA256=c29e8e1520e7298fabb26545f804e35bb3af257005c1c2df62e39986458d7c38
+#     CMAKE_GENERATOR Ninja
+#     CMAKE_CACHE_ARGS
+#         -DCMAKE_BUILD_TYPE:STRING=Release
+#         -DHIGHFIVE_UNIT_TESTS:BOOL=OFF
+#         -DHIGHFIVE_USE_BOOST:BOOL=ON
+#         -DHIGHFIVE_USE_EIGEN:BOOL=ON
+#         -DHIGHFIVE_EXAMPLES:BOOL=OFF
+#         -DHIGHFIVE_BUILD_DOCS:BOOL=OFF
+#         -DBoost_NO_BOOST_CMAKE:BOOL=OFF
+#     DEPENDS boost eigen libhdf5
+#     DOWNLOAD_DIR ${DOWNLOAD_DIR}
+# )
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,6 @@ ARG NINJA_VERSION=1.12.1
 # Has to be repeated here so it's imported from the "top level" above the FROM
 ARG TARGET_ARCH
 
-COPY CMakeLists.txt libaec_cmakelists.patch /tmp/
 
 RUN --mount=type=cache,target=/cache \
     if [[ "$TARGET_ARCH" == "aarch64" ]]; then NINJA_ARCH="-aarch64"; else NINJA_ARCH=""; fi \
@@ -17,9 +16,28 @@ RUN --mount=type=cache,target=/cache \
     && unzip /cache/ninja-linux.zip -d /usr/local/bin \
     && ninja --version \
     && yum install -y openblas-devel \
+    && true
+COPY CMakeLists.txt libaec_cmakelists.patch /tmp/
+RUN --mount=type=cache,target=/cache \
+    true \
     && mkdir build \
     && pushd build \
     && cmake -G Ninja -DLIBAEC_PATCHFILE=/tmp/libaec_cmakelists.patch ../tmp \
     && ninja \
     && popd \
     && rm -rf build
+
+FROM builder AS tester
+
+RUN yum install -y python3.12-pip \
+    && python3.12 -m pip install --root-user-action=ignore build auditwheel
+
+COPY cantera-3.1.0a4.tar.gz /project/
+
+RUN --mount=type=cache,target=/root/.cache \
+    pushd project \
+    && tar --strip-components=1 -zxf cantera-*.tar.gz \
+    && rm -f cantera-*.tar.gz \
+    && python3.12 -m build --wheel . \
+    && pushd dist \
+    && auditwheel repair -w . cantera*.whl
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-'manylinux' Docker images are used to build Python extension modules compatible with many popular Linux distributions. This repository builds several dependencies on top of the standard manylinux images, for using in building Cantera.
+'manylinux' Docker images are used to build Python extension modules compatible with many popular Linux distributions. This repository builds several dependencies on top of the standard manylinux images, for use in building Cantera.
 
 Images are published on GitHub container registry: