musica 0.11.1__cp38-cp38-win32.whl → 0.11.1.0__cp38-cp38-win32.whl

musica/CMakeLists.txt

@@ -19,9 +19,15 @@ if (APPLE)
     BUILD_WITH_INSTALL_RPATH TRUE
   )
 elseif(UNIX)
-  # set the rpath for the shared library
+  set(CUDA_RPATH
+    "$ORIGIN/../../nvidia/cublas/lib"
+    "$ORIGIN/../../nvidia/cuda_runtime/lib"
+  )
+
+  message(STATUS "Adding RPATH for python site packages libs at ${CUDA_RPATH}")
+
   set_target_properties(_musica PROPERTIES
-    INSTALL_RPATH "$ORIGIN"
+    INSTALL_RPATH "$ORIGIN;${CUDA_RPATH}"
     BUILD_WITH_INSTALL_RPATH TRUE
   )
 endif()

musica/_version.py

@@ -1 +1 @@
-version = "0.11.1"
+version = "0.11.1.0"

musica/musica.cpp

@@ -77,14 +77,17 @@ void bind_musica(py::module_ &core)
   core.def("_vector_size",
       [](const musica::MICMSolver solver_type)
       {
-        if (solver_type == musica::MICMSolver::RosenbrockStandardOrder ||
-            solver_type == musica::MICMSolver::BackwardEulerStandardOrder) {
-          return static_cast<std::size_t>(0);
-        } else if (solver_type == musica::MICMSolver::Rosenbrock ||
-                 solver_type == musica::MICMSolver::BackwardEuler) {
-          return musica::MUSICA_VECTOR_SIZE;
-        } else {
-          throw py::value_error("Invalid MICM solver type.");
+        switch (solver_type)
+        {
+          case musica::MICMSolver::Rosenbrock:
+          case musica::MICMSolver::BackwardEuler:
+          case musica::MICMSolver::CudaRosenbrock:
+            return musica::MUSICA_VECTOR_SIZE;
+          case musica::MICMSolver::RosenbrockStandardOrder:
+          case musica::MICMSolver::BackwardEulerStandardOrder:
+            return static_cast<std::size_t>(0);
+          default:
+            throw py::value_error("Invalid MICM solver type.");
         }
       },
       "Returns the vector dimension for vector-ordered solvers, 0 otherwise.");

musica/test/test_analytical.py

@@ -261,7 +261,7 @@ def test_cuda_rosenbrock():
     if _is_cuda_available():
         solver = musica.MICM(
             config_path="configs/analytical",
-            solver_type=musica.micmsolver.cuda_rosenbrock)
+            solver_type=musica.SolverType.cuda_rosenbrock)
         state = solver.create_state()
         TestSingleGridCell(solver, state, 200.0, 5)
     else:

musica/tools/prepare_build_environment_linux.sh

@@ -3,9 +3,29 @@
 set -e
 set -x
 
-# Cuda can only be installed on x86_64 architecture.
-if [ "$(uname -m)" == "x86_64" ]; then
-  # Install CUDA 12.2:
+# Update the mirror list to use vault.centos.org
+sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+
+sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
+yum install -y zip tree
+
+# Use CIBW_ARCHS or CIBW_ARCH if set, else fallback to uname -m
+if [ -n "$CIBW_ARCHS" ]; then
+  target_arch="$CIBW_ARCHS"
+elif [ -n "$CIBW_ARCH" ]; then
+  target_arch="$CIBW_ARCH"
+else
+  target_arch="$(uname -m)"
+fi
+
+echo "Detected target_arch: $target_arch"
+
+if [ "$target_arch" = "x86_64" ]; then
+  # Install CUDA 12.2 for x86_64:
   yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
   # error mirrorlist.centos.org doesn't exists anymore.
   sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo

musica/tools/repair_wheel_gpu.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+set -e
+
+auditwheel repair --exclude libcublas --exclude libcublasLt --exclude libcudart -w "$2" "$1"
+
+for whl in "$2"/*.whl; do
+  tmpdir=$(mktemp -d)
+  unzip -q "$whl" -d "$tmpdir"
+  tree "$tmpdir"
+  echo "Before patchelf:"
+  readelf -d "$tmpdir"/_musica*.so
+  patchelf --remove-rpath "$tmpdir"/_musica*.so
+  patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../../nvidia/cublas/lib:\$ORIGIN/../../nvidia/cuda_runtime/lib" --force-rpath "$tmpdir"/_musica*.so
+  # Remove bundled CUDA libraries
+  rm -f "$tmpdir"/musica.libs/libcudart-*.so*
+  rm -f "$tmpdir"/musica.libs/libcublas-*.so*
+  rm -f "$tmpdir"/musica.libs/libcublasLt-*.so*
+  echo "After patchelf:"
+  readelf -d "$tmpdir"/_musica*.so
+  # Repack the wheel with correct structure
+  (cd "$tmpdir" && zip -qr "${whl%.whl}.patched.whl" .)
+  rm -rf "$tmpdir"
+  # Replace the original wheel with the patched one
+  mv "${whl%.whl}.patched.whl" "$whl"
+done

{musica-0.11.1.dist-info → musica-0.11.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: musica
-Version: 0.11.1
+Version: 0.11.1.0
 Summary: MUSICA is a Python library for performing computational simulations in atmospheric chemistry.
 Author-Email: Matthew Dawsom <mattdawson@ucar.edu>, Jiwon Gim <jiwongim@ucar.edu>, David Fillmore <fillmore@ucar.edu>, Kyle Shores <kshores@ucar.edu>, Montek Thind <mthind@ucar.edu>
 Maintainer-Email: ACOM MUSICA Developers <musica-support@ucar.edu>
@@ -210,6 +210,9 @@ Project-URL: homepage, https://wiki.ucar.edu/display/MUSICA/MUSICA+Home
 Provides-Extra: test
 Requires-Dist: numpy; extra == "test"
 Requires-Dist: pytest; extra == "test"
+Provides-Extra: gpu
+Requires-Dist: nvidia-cublas-cu12; extra == "gpu"
+Requires-Dist: nvidia-cuda-runtime-cu12; extra == "gpu"
 Description-Content-Type: text/markdown
 
 # MUSICA

{musica-0.11.1.dist-info → musica-0.11.1.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-_musica.cp38-win32.pyd,sha256=tJkY0OHOCKk54wxomyeqItg9x-0FsuYL4gGEetLUFqc,1249792
-lib/musica.lib,sha256=i8aPFt4pOdY6hHeT6wZoy2py28KNlRKLLWNRCvylhAE,3434448
-lib/yaml-cpp.lib,sha256=_oEnvFLjkIZ4HJMgPDRV2FwiIFsWgYpCc2JijPRftCg,1799180
+_musica.cp38-win32.pyd,sha256=znyg7nqDBKafcaq9YHscZSDhoKxEQfLSyknoGlYLWTI,1250304
+lib/musica.lib,sha256=_VeURRPQIOy9nhIzEvbcb-qsrVNFR6FerFj1u7tREPE,3434460
+lib/yaml-cpp.lib,sha256=MLaHgebxUBu9PbsGtUaNiLkDkAleoN1lUk2_sVtxbS4,1799180
 musica/__init__.py,sha256=ZtW55jXUkE_2GFco1Q1GyGrpyNoVej6gfbpEWHzfpM0,85
-musica/_version.py,sha256=TYiYsKySORMKTb6v-yyuXf6S-1keJ7xf0QxD5hFzCmg,20
+musica/_version.py,sha256=t68TSEz4ZMVbCN2VtLHNxi0spGZHUzpbBHqDbLCF2Zw,22
 musica/binding.cpp,sha256=rpc7Fn_GmR2Femli_gEvtgtiprRnForekUlMDoBo7PQ,674
-musica/CMakeLists.txt,sha256=yDo8hzh5m44GUMoeTH3z1IC5zWJUYQeK8CrGFGfdJ8U,1010
+musica/CMakeLists.txt,sha256=j5m-7lf8E1YwpiEeUml5GL27hS4sfpgn2h2LzoQDiO8,1174
 musica/mechanism_configuration.cpp,sha256=JXGAO3j1EEKYdswjrtX8J3KcI_YlfS9WGRmlMxctaDw,27619
 musica/mechanism_configuration.py,sha256=_0kS0fvGS-CbQ_YfJOeSM416u7WLPwq7GzDcPgGGBWA,59302
-musica/musica.cpp,sha256=DH18hBFpJF9m68F1FaGgVBwxVxaeYr304dLF2DY4FOo,8579
+musica/musica.cpp,sha256=z4nucF98Nd-V6U_OLp_5RsW4WGE8qMn3GWLvCuY_nJE,8612
 musica/test/examples/v0/config.json,sha256=JDQdrDNRmRXGYlytX1uiSDV1lkYIAneLwlodHKFw-os,85
 musica/test/examples/v0/config.yaml,sha256=r31QbiFE2YDudGxLGpTKnpyveTnlfXeLgJ2qSrQddDY,47
 musica/test/examples/v0/reactions.json,sha256=SmRUE5XOAv0h3HOWg4Fb1swBiZvZ-1hsIrmMCJqEVIk,4380
@@ -16,14 +16,15 @@ musica/test/examples/v0/species.json,sha256=klFuYb2vAtWdHfHJVYuIuPe_6LHRTuB0Aw29
 musica/test/examples/v0/species.yaml,sha256=ECT9DDa2GMwhSRaRLxjOiCATTKkTRTPwugRsUjHSytY,302
 musica/test/examples/v1/full_configuration.json,sha256=1-kr2bZJvfuENfy6FMfc5ZEOtgs_NhzHYeGrEGLqLMw,9240
 musica/test/examples/v1/full_configuration.yaml,sha256=9NSd8BUJnJ6CPjX9ZngqbFDEqUf1qG5ixbnQDO2m79k,5505
-musica/test/test_analytical.py,sha256=UAM3YEx6OnxkQem0oidptY5mM1smDkcWIyIA0iG-f6w,14098
+musica/test/test_analytical.py,sha256=lY5XuEMEg7IEfTvEIeSRhShMNdX39q00H8RjqGnZB30,14098
 musica/test/test_chapman.py,sha256=_OHLNBWT5qcU8s3mQAisV16qOdyRq7gdaU4nFZtxTnY,3193
 musica/test/test_parser.py,sha256=s8b55MntiDmUeW3GP_-JHucEhxi5RMSzPWQULM73rpg,24985
 musica/test/tuvx.py,sha256=L8X7rJ09HiRlrhLK6fjircI8tGHnFCZJzVow8He5YOE,126
-musica/tools/prepare_build_environment_linux.sh,sha256=qJeVEjYuWFYZuk9Q26gu0Ly4oKx06Sp5f-WVr3PmnYQ,822
+musica/tools/prepare_build_environment_linux.sh,sha256=Xrd95nPnznqTAc24TVeehXP-7uMkJE1FysKKZsPYgPs,1507
 musica/tools/prepare_build_environment_windows.sh,sha256=sBBWhJQaS2zWDVFLIDMNBMOMPw8auXwnwz7nhuB5Q_k,847
+musica/tools/repair_wheel_gpu.sh,sha256=bXFSgNjCE4D8NvLGfNkIDyt2Qsx6AlT1VfHEBlrRTz4,942
 musica/types.py,sha256=GA04nbo-m7Jg_TQMvFMdMC35kzSDynUHvt7alBnM8FI,15257
-musica-0.11.1.dist-info/METADATA,sha256=JRV9nXqgBkcKv9C4HS2Nqkl6Lz_N7Fn7h5VyQymqr1o,20686
-musica-0.11.1.dist-info/WHEEL,sha256=uahSonAAJbW6pnbL2rjzgIZTfu3PVPQawM-DbOntZgs,100
-musica-0.11.1.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-musica-0.11.1.dist-info/RECORD,,
+musica-0.11.1.0.dist-info/METADATA,sha256=TBJI5PEajWEcPSut2_1k4J6NL2tA9EH-iPLwgCRecHo,20814
+musica-0.11.1.0.dist-info/WHEEL,sha256=_Pmsvpc3WxLRgLrYO-RD-hymFIujk1gezLs1oSSsKpk,100
+musica-0.11.1.0.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+musica-0.11.1.0.dist-info/RECORD,,

{musica-0.11.1.dist-info → musica-0.11.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.11.2
+Generator: scikit-build-core 0.11.3
 Root-Is-Purelib: false
 Tag: cp38-cp38-win32