musica 0.11.1.2__cp39-cp39-win_amd64.whl → 0.11.1.3__cp39-cp39-win_amd64.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.2"
+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,21 +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
+  readelf -d $so_path
   # Use patchelf to fix the rpath and library dependencies
-  patchelf --remove-rpath "$tmpdir"/_musica*.so
-  patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../../nvidia/cublas/lib:\$ORIGIN/../../nvidia/cuda_runtime/lib" --force-rpath "$tmpdir"/_musica*.so
+  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 "$tmpdir"/_musica*.so
-  patchelf --replace-needed libcublas-e779a79d.so.12.2.5.6 libcublas.so.12 "$tmpdir"/_musica*.so
-  patchelf --replace-needed libcublasLt-fbfbc8a1.so.12.2.5.6 libcublasLt.so.12 "$tmpdir"/_musica*.so
+  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.2.dist-info → musica-0.11.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: musica
-Version: 0.11.1.2
+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.2.dist-info → musica-0.11.1.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
-_musica.cp39-win_amd64.pyd,sha256=Rq-evLr9QtznJbb8T0ZE2-tVhf4IvCXTe7oeQHaqlxg,1388544
-lib/musica.lib,sha256=dVBEIayZ1QuUgRHtHwXcMuvhgGcZT9KO9y4dFQEcF7U,5507286
-lib/yaml-cpp.lib,sha256=ArZqmD9HqvStcmCYhsUdW3tLlT2QbNWb3HfhtnS85Ws,2764186
-musica/__init__.py,sha256=ZtW55jXUkE_2GFco1Q1GyGrpyNoVej6gfbpEWHzfpM0,85
-musica/_version.py,sha256=Q-neckHF6Bee2eqnfo7VN5R_4zuG4-FYCTHp3IILvdM,22
+musica/__init__.py,sha256=vlnNyE1xHUnuUku_1lLg8bg_pYFHxFH3DpnOcQMKP1c,92
+musica/_musica.cp39-win_amd64.pyd,sha256=i4RJSqWfmxwWPF4HHL98GOUN0I0GB-WEShLBov4Z9IY,1388544
+musica/_version.py,sha256=a-wMJUGHDPJ_p6jbklLRlOFCvtij_kv2yf1N-xME9Gs,22
 musica/binding.cpp,sha256=rpc7Fn_GmR2Femli_gEvtgtiprRnForekUlMDoBo7PQ,674
-musica/CMakeLists.txt,sha256=j5m-7lf8E1YwpiEeUml5GL27hS4sfpgn2h2LzoQDiO8,1174
+musica/CMakeLists.txt,sha256=4B3tGFYd_ywwZ5XHnbnHQXCzR9rA8mDgfsgrsPia8hY,1078
+musica/lib/musica.lib,sha256=cqgjF35qY1GGMuzY9IT9Uh0xIQZfiUTpmMx9K4ApXEo,5507286
+musica/lib/yaml-cpp.lib,sha256=-g76dPgy6qYCGCb-QmEAbivXD1ouEsc7-fNWFK348D4,2764186
 musica/mechanism_configuration.cpp,sha256=JXGAO3j1EEKYdswjrtX8J3KcI_YlfS9WGRmlMxctaDw,27619
-musica/mechanism_configuration.py,sha256=_0kS0fvGS-CbQ_YfJOeSM416u7WLPwq7GzDcPgGGBWA,59302
+musica/mechanism_configuration.py,sha256=Zh2qrVq9m756IE57vR_lNHrAKFeY3deIh5nZdi8SBTk,59309
 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
@@ -16,15 +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=lY5XuEMEg7IEfTvEIeSRhShMNdX39q00H8RjqGnZB30,14098
+musica/test/test_analytical.py,sha256=xWsMiysE_Ol49DJMGZU9jfGOUFHRjumeon7c9Q-658U,14105
 musica/test/test_chapman.py,sha256=_OHLNBWT5qcU8s3mQAisV16qOdyRq7gdaU4nFZtxTnY,3193
-musica/test/test_parser.py,sha256=s8b55MntiDmUeW3GP_-JHucEhxi5RMSzPWQULM73rpg,24985
+musica/test/test_parser.py,sha256=R3GpWj2VQv8RNvjTZOjpoUzpa98yI1zfFbtKGrkIP_w,24992
 musica/test/tuvx.py,sha256=L8X7rJ09HiRlrhLK6fjircI8tGHnFCZJzVow8He5YOE,126
 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=-_Bh2fWv_RE5N02CVEbMh8PMZ0ecygk-DafsCIaALdg,1347
-musica/types.py,sha256=GA04nbo-m7Jg_TQMvFMdMC35kzSDynUHvt7alBnM8FI,15257
-musica-0.11.1.2.dist-info/METADATA,sha256=Aehj-KwjLoVTpAFwaocvKadc3T-meJRaq_OhiK8qRyM,20814
-musica-0.11.1.2.dist-info/WHEEL,sha256=xQ-xCmlF4qxouQAzuoL89aPcFWjT6GFALxrEZjPUtFk,104
-musica-0.11.1.2.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-musica-0.11.1.2.dist-info/RECORD,,
+musica/tools/repair_wheel_gpu.sh,sha256=HNAePZE3gp0ODnQeDfBOfUmuGnADegHlC-oQLJRTWj4,1290
+musica/types.py,sha256=yn20q6E8Xdoomcm3zdoebRgNKrnd6SgP0yz2WuwjMJ0,15259
+musica-0.11.1.3.dist-info/METADATA,sha256=oB8w46MzI7reKyE2mtWvpuBY0dtjSIYXk7zrBjbXrog,20814
+musica-0.11.1.3.dist-info/WHEEL,sha256=xQ-xCmlF4qxouQAzuoL89aPcFWjT6GFALxrEZjPUtFk,104
+musica-0.11.1.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+musica-0.11.1.3.dist-info/RECORD,,