musica 0.11.1.1__cp311-cp311-macosx_11_0_arm64.whl → 0.11.1.3__cp311-cp311-macosx_11_0_arm64.whl

musica/CMakeLists.txt

@@ -19,15 +19,8 @@ if (APPLE)
     BUILD_WITH_INSTALL_RPATH TRUE
   )
 elseif(UNIX)
-  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;${CUDA_RPATH}"
+    INSTALL_RPATH "$ORIGIN"
     BUILD_WITH_INSTALL_RPATH TRUE
   )
 endif()
@@ -44,4 +37,11 @@ else()
   set(PYTHON_MODULE_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 endif()
 
-install(TARGETS _musica yaml-cpp musica LIBRARY DESTINATION .)
+install(TARGETS _musica LIBRARY DESTINATION musica)
+
+install(
+  TARGETS 
+    yaml-cpp musica 
+    LIBRARY DESTINATION musica/lib
+    ARCHIVE DESTINATION musica/lib
+)

musica/__init__.py

@@ -1,3 +1,3 @@
-from _musica import *
+from musica._musica import *
 from .types import *
 from .mechanism_configuration import *

musica/_version.py

@@ -1 +1 @@
-version = "0.11.1.1"
+version = "0.11.1.3"

musica/mechanism_configuration.py

@@ -4,7 +4,7 @@
 # This file is part of the musica Python package.
 # For more information, see the LICENSE file in the top-level directory of this distribution.
 from typing import Optional, Any, Dict, List, Union, Tuple
-from _musica._mechanism_configuration import (
+from musica._musica._mechanism_configuration import (
     _ReactionType,
     _Species,
     _Phase,

musica/test/test_analytical.py

@@ -3,7 +3,7 @@ import numpy as np
 import musica
 import random
 import musica.mechanism_configuration as mc
-from _musica._core import _is_cuda_available
+from musica._musica._core import _is_cuda_available
 
 
 def TestSingleGridCell(solver, state, time_step, places=5):

musica/test/test_parser.py

@@ -1,6 +1,6 @@
 import pytest
 from musica.mechanism_configuration import *
-from _musica._mechanism_configuration import _ReactionType
+from musica._musica._mechanism_configuration import _ReactionType
 
 
 def validate_species(species):

musica/tools/repair_wheel_gpu.sh

@@ -7,16 +7,22 @@ for whl in "$2"/*.whl; do
   tmpdir=$(mktemp -d)
   unzip -q "$whl" -d "$tmpdir"
   tree "$tmpdir"
+  so_path="$tmpdir"/musica/_musica*.so
   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
+  readelf -d $so_path
+  # Use patchelf to fix the rpath and library dependencies
+  patchelf --remove-rpath $so_path
+  patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../nvidia/cublas/lib:\$ORIGIN/../nvidia/cuda_runtime/lib" --force-rpath $so_path
+  # these may need to be periodically updated
+  patchelf --replace-needed libcudart-b5a066d7.so.12.2.140 libcudart.so.12 $so_path
+  patchelf --replace-needed libcublas-e779a79d.so.12.2.5.6 libcublas.so.12 $so_path
+  patchelf --replace-needed libcublasLt-fbfbc8a1.so.12.2.5.6 libcublasLt.so.12 $so_path
   # 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
+  readelf -d $so_path
   # Repack the wheel with correct structure
   (cd "$tmpdir" && zip -qr "${whl%.whl}.patched.whl" .)
   rm -rf "$tmpdir"

musica/types.py

@@ -3,10 +3,10 @@
 #
 # This file is part of the musica Python package.
 # For more information, see the LICENSE file in the top-level directory of this distribution.
-from typing import Optional, Any, Dict, List, Union, Tuple
+from typing import Optional, Dict, List, Union, Tuple
 from os import PathLike
 import math
-from _musica._core import (
+from musica._musica._core import (
     _Conditions,
     _SolverType,
     _Solver,

{musica-0.11.1.1.dist-info → musica-0.11.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: musica
-Version: 0.11.1.1
+Version: 0.11.1.3
 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>

{musica-0.11.1.1.dist-info → musica-0.11.1.3.dist-info}/RECORD

@@ -1,25 +1,23 @@
-_musica.cpython-311-darwin.so,sha256=UhR4b7c6midhbygkVsV7P0XALgEUHKJKKnrWy1E-_tg,1693440
-musica-0.11.1.1.dist-info/RECORD,,
-musica-0.11.1.1.dist-info/WHEEL,sha256=v20ZoihpvGQ2MIpmMhDC3RxOojjT26wiePNzcVNSzeM,114
-musica-0.11.1.1.dist-info/METADATA,sha256=URpXjU5lo-wyROln6GI9YbAqGFDPH0gq8O30EzTW5uc,20814
-musica-0.11.1.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lib/libyaml-cpp.a,sha256=0s7V45-6NqziPQshuI3bVKcKr3SYx-HTt4PBBzI0jLQ,795856
-lib/libmusica.a,sha256=jjZO9JnUbfr31hSi3jNUM-wz8-43YBs4h8HdQoTzTaQ,1355336
-musica/CMakeLists.txt,sha256=FJkD0MaB1qUNDpyCsjELAW4wpuSslfzyo-YCJwLkIp4,1128
-musica/mechanism_configuration.py,sha256=pma248L_jjQecsxL9zIn-S4KxXNlSL1NL4LB4fN5jV0,58011
+musica-0.11.1.3.dist-info/RECORD,,
+musica-0.11.1.3.dist-info/WHEEL,sha256=v20ZoihpvGQ2MIpmMhDC3RxOojjT26wiePNzcVNSzeM,114
+musica-0.11.1.3.dist-info/METADATA,sha256=oB8w46MzI7reKyE2mtWvpuBY0dtjSIYXk7zrBjbXrog,20814
+musica-0.11.1.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+musica/CMakeLists.txt,sha256=3U0eWvyisYs7N3hjIbF4jvZmyu1ANASWu3TFbUWbdY8,1032
+musica/mechanism_configuration.py,sha256=NXQRxKR_vqWSdhXLBQoZmfjNHuYhIQIcFdRMU9V0MjM,58018
 musica/binding.cpp,sha256=zDD_TQ7icS_lNG7iUAp23VG7_odbptGJbtRdYjalsdc,656
-musica/_version.py,sha256=TDOJiVZ58e1fM3phG3qufrhY43ZQTXYyp_PCrrYj2Ek,21
-musica/__init__.py,sha256=CW7SVuK4kO8bYg8wB56YGun-NBRmBqWQO379qP21Yvo,82
-musica/types.py,sha256=WQYTDT3aZQVvCyXmaEGuBYqtdx3IZk1Ao5bcmPUGzXM,14895
+musica/_version.py,sha256=rWofPK7FSYAXzMkIby1qsuT93bZ5vP19yAl8ow1RFtg,21
+musica/_musica.cpython-311-darwin.so,sha256=UhR4b7c6midhbygkVsV7P0XALgEUHKJKKnrWy1E-_tg,1693440
+musica/__init__.py,sha256=v81Z3iQfONy1NdSlRB7Skdwl2mGYF-w9K_zbXzA9HqM,89
+musica/types.py,sha256=kK7pyXLMobfHz5y7mJy858-4YE2RJC5PsOsbBB5ktX0,14897
 musica/mechanism_configuration.cpp,sha256=E7GGeftgQGL303nsk2C7pwYpPiMAQcuxdbadohHb1QM,27100
 musica/musica.cpp,sha256=BBRtL9_Q62ia_vhmpTqpnHHGimPBpCR5YVth8x0i0h4,8399
 musica/tools/prepare_build_environment_windows.sh,sha256=zMY_RIerqfMC1VlfpZ2KjjDWfBUOvvx8oRNk_jJhmII,826
 musica/tools/prepare_build_environment_linux.sh,sha256=9rkT0bTVmu9QQqhS6eGRX1HXMQZLfkUGakkC3i5VKec,1466
-musica/tools/repair_wheel_gpu.sh,sha256=PHWls1cS9QOElQDIgSMOh7TkHB8UNylZbls9zSjSus0,917
-musica/test/test_parser.py,sha256=VhOPNrcDnFGgk2v_iMoLNq5JBP22VbkHTHLk3N09d3s,24292
+musica/tools/repair_wheel_gpu.sh,sha256=L3jdsUfqiBeulXrkmxiVD0ZjvfdKO7PYjOq1RSyWXFw,1259
+musica/test/test_parser.py,sha256=vvuy2YJzkh0kc28zCS8vB7x4FYsS06kx0YN_cBFTQQ0,24299
 musica/test/test_chapman.py,sha256=Wm0wLy6E1Zm8p6cLaICQO9tSy_szMkYn9E7MPCtobno,3070
 musica/test/tuvx.py,sha256=rWvBcG6cgLJylqkf8M0MFMKT2AkyoaZlGdaKjVSbCR8,116
-musica/test/test_analytical.py,sha256=5rIlpy5bzpTfZNv8wAND8O5KA8Wvh3Bm64pTRRlSHgc,13775
+musica/test/test_analytical.py,sha256=3yS61j3uD3d0jhA7kBN5yzA6qoGuGGlnb-UeNH-N-PE,13782
 musica/test/examples/v1/full_configuration.yaml,sha256=s9Go7AQv9OFQ7zVb1k4wmDj2vpHYzVCTRqi8JZTHlUM,5235
 musica/test/examples/v1/full_configuration.json,sha256=7AqPhTHodSjtV8LOPoUsA9MtCu_Xc28RVOlhNGPI9GQ,8807
 musica/test/examples/v0/species.json,sha256=xKTcwh9QV9sRjLPK9GvGEnatBrRPbP857NmPG0bCXqU,565
@@ -28,3 +26,5 @@ musica/test/examples/v0/config.json,sha256=7s6g5jxH2GiEiRcZmO13IJ5k4walg1C9t-dQr
 musica/test/examples/v0/config.yaml,sha256=GgA18mP8ZCzOdY-AlAePK48M05PJFPeWCk-IfrPN_VE,44
 musica/test/examples/v0/reactions.json,sha256=7WJhItBPtGu89vLcPMK6izW8BvwUAIjfzqwjtDmfPPg,4188
 musica/test/examples/v0/reactions.yaml,sha256=uEuQOz5i7vGyn0G7KsmdWv23V2Gn0QUmexrK030CFlo,2266
+musica/lib/libyaml-cpp.a,sha256=i4XjgmvjZSz4dIvC_LFpr1Gcx92cmQ775YAKP44R4l0,795856
+musica/lib/libmusica.a,sha256=NXUXUSqlHoPZXbLPHwMVvZ6NALq9ZLjunKxfLM5b7Hs,1355336