Fix macOS LAMMPS plugin loading issue (#72)

automerged PR by conda-forge/automerge-action
conda-forge · Mar 22, 2024 · 8f63c8d · 8f63c8d
2 parents 5ec5eae + cb21a78
commit 8f63c8d
Show file tree

Hide file tree

Showing 34 changed files with 77 additions and 71 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/...lernvcccuda_compiler_version11.2cxx_compiler_version10mpimpichpython3.10.____cpython.yaml b/...lernvcccuda_compiler_version11.2cxx_compiler_version10mpimpichpython3.10.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...lernvcccuda_compiler_version11.2cxx_compiler_version10mpimpichpython3.11.____cpython.yaml b/...lernvcccuda_compiler_version11.2cxx_compiler_version10mpimpichpython3.11.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...ilernvcccuda_compiler_version11.2cxx_compiler_version10mpimpichpython3.9.____cpython.yaml b/...ilernvcccuda_compiler_version11.2cxx_compiler_version10mpimpichpython3.9.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...rnvcccuda_compiler_version11.2cxx_compiler_version10mpiopenmpipython3.10.____cpython.yaml b/...rnvcccuda_compiler_version11.2cxx_compiler_version10mpiopenmpipython3.10.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...rnvcccuda_compiler_version11.2cxx_compiler_version10mpiopenmpipython3.11.____cpython.yaml b/...rnvcccuda_compiler_version11.2cxx_compiler_version10mpiopenmpipython3.11.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...ernvcccuda_compiler_version11.2cxx_compiler_version10mpiopenmpipython3.9.____cpython.yaml b/...ernvcccuda_compiler_version11.2cxx_compiler_version10mpiopenmpipython3.9.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...lernvcccuda_compiler_version11.8cxx_compiler_version11mpimpichpython3.10.____cpython.yaml b/...lernvcccuda_compiler_version11.8cxx_compiler_version11mpimpichpython3.10.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...lernvcccuda_compiler_version11.8cxx_compiler_version11mpimpichpython3.11.____cpython.yaml b/...lernvcccuda_compiler_version11.8cxx_compiler_version11mpimpichpython3.11.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...ilernvcccuda_compiler_version11.8cxx_compiler_version11mpimpichpython3.9.____cpython.yaml b/...ilernvcccuda_compiler_version11.8cxx_compiler_version11mpimpichpython3.9.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...rnvcccuda_compiler_version11.8cxx_compiler_version11mpiopenmpipython3.10.____cpython.yaml b/...rnvcccuda_compiler_version11.8cxx_compiler_version11mpiopenmpipython3.10.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...rnvcccuda_compiler_version11.8cxx_compiler_version11mpiopenmpipython3.11.____cpython.yaml b/...rnvcccuda_compiler_version11.8cxx_compiler_version11mpiopenmpipython3.11.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...ernvcccuda_compiler_version11.8cxx_compiler_version11mpiopenmpipython3.9.____cpython.yaml b/...ernvcccuda_compiler_version11.8cxx_compiler_version11mpiopenmpipython3.9.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...lerNonecuda_compiler_versionNonecxx_compiler_version12mpimpichpython3.10.____cpython.yaml b/...lerNonecuda_compiler_versionNonecxx_compiler_version12mpimpichpython3.10.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...lerNonecuda_compiler_versionNonecxx_compiler_version12mpimpichpython3.11.____cpython.yaml b/...lerNonecuda_compiler_versionNonecxx_compiler_version12mpimpichpython3.11.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...ilerNonecuda_compiler_versionNonecxx_compiler_version12mpimpichpython3.9.____cpython.yaml b/...ilerNonecuda_compiler_versionNonecxx_compiler_version12mpimpichpython3.9.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...rNonecuda_compiler_versionNonecxx_compiler_version12mpiopenmpipython3.10.____cpython.yaml b/...rNonecuda_compiler_versionNonecxx_compiler_version12mpiopenmpipython3.10.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...rNonecuda_compiler_versionNonecxx_compiler_version12mpiopenmpipython3.11.____cpython.yaml b/...rNonecuda_compiler_versionNonecxx_compiler_version12mpiopenmpipython3.11.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...erNonecuda_compiler_versionNonecxx_compiler_version12mpiopenmpipython3.9.____cpython.yaml b/...erNonecuda_compiler_versionNonecxx_compiler_version12mpiopenmpipython3.9.____cpython.yaml
@@ -3,7 +3,7 @@ c_compiler:
 c_compiler_version:
 - '12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...da-nvcccuda_compiler_version12.0cxx_compiler_version12mpimpichpython3.10.____cpython.yaml b/...da-nvcccuda_compiler_version12.0cxx_compiler_version12mpimpichpython3.10.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...da-nvcccuda_compiler_version12.0cxx_compiler_version12mpimpichpython3.11.____cpython.yaml b/...da-nvcccuda_compiler_version12.0cxx_compiler_version12mpimpichpython3.11.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...uda-nvcccuda_compiler_version12.0cxx_compiler_version12mpimpichpython3.9.____cpython.yaml b/...uda-nvcccuda_compiler_version12.0cxx_compiler_version12mpimpichpython3.9.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...-nvcccuda_compiler_version12.0cxx_compiler_version12mpiopenmpipython3.10.____cpython.yaml b/...-nvcccuda_compiler_version12.0cxx_compiler_version12mpiopenmpipython3.10.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...-nvcccuda_compiler_version12.0cxx_compiler_version12mpiopenmpipython3.11.____cpython.yaml b/...-nvcccuda_compiler_version12.0cxx_compiler_version12mpiopenmpipython3.11.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...a-nvcccuda_compiler_version12.0cxx_compiler_version12mpiopenmpipython3.9.____cpython.yaml b/...a-nvcccuda_compiler_version12.0cxx_compiler_version12mpiopenmpipython3.9.____cpython.yaml
@@ -40,7 +40,7 @@ tensorflow:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml
@@ -77,6 +77,9 @@ cxx_compiler_version:          # [linux and os.environ.get("CF_CUDA_ENABLED", "F
 fortran_compiler_version:      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
+c_stdlib_version:              # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+  - 2.17                       # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+
 cdt_name:                      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - cos7                       # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
@@ -87,4 +90,4 @@ docker_image:                                      # [os.environ.get("BUILD_PLAT
   - quay.io/condaforge/linux-anvil-aarch64         # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
   # case: cross-compilation (build != target)
   - quay.io/condaforge/linux-anvil-cos7-x86_64     # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-  - quay.io/condaforge/linux-anvil-cos7-x86_64     # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
+  - quay.io/condaforge/linux-anvil-cos7-x86_64     # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -9,3 +9,7 @@ github:
   branch_name: main
   tooling_branch_name: main
 test: native_and_emulated
+os_version:
+  linux_64: cos7
+  linux_aarch64: cos7
+  linux_ppc64le: cos7
diff --git a/recipe/3473.patch b/recipe/3473.patch
@@ -0,0 +1,22 @@
+From adf640a49cad144d707686e629f24756e28968f6 Mon Sep 17 00:00:00 2001
+From: Chenxing Luo <[email protected]>
+Date: Sat, 16 Mar 2024 18:53:43 -0400
+Subject: [PATCH] Fix LAMMPS plugin symlink path on macOS platform
+
+---
+ source/lmp/plugin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/lmp/plugin/CMakeLists.txt b/source/lmp/plugin/CMakeLists.txt
+index bfc2253412..4fdae7ac5b 100644
+--- a/source/lmp/plugin/CMakeLists.txt
++++ b/source/lmp/plugin/CMakeLists.txt
+@@ -126,7 +126,7 @@ if(DEFINED LAMMPS_SOURCE_ROOT OR DEFINED LAMMPS_VERSION)
+       install(
+         CODE "execute_process( \
+         COMMAND ${CMAKE_COMMAND} -E create_symlink \
+-		../${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX} \
++		../${CMAKE_SHARED_MODULE_PREFIX}${libname}${CMAKE_SHARED_MODULE_SUFFIX} \
+         ${CMAKE_INSTALL_PREFIX}/lib/${libname}/${PLUGINNAME}   \
+         )")
+     endif()