From ff301ddf8941bd8e912599495250e90355f18dc6 Mon Sep 17 00:00:00 2001 From: Daniel Dunning <39738037+djdunning@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:12:59 -0700 Subject: [PATCH] fixed platform issue for sure --- .conda/elements/cuda/conda_build_config.yaml | 4 +++- .conda/elements/cuda/meta.yaml | 7 +++---- .conda/matar/cuda/conda_build_config.yaml | 4 +++- .conda/matar/cuda/meta.yaml | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.conda/elements/cuda/conda_build_config.yaml b/.conda/elements/cuda/conda_build_config.yaml index 8ef61a34a..6befd9985 100644 --- a/.conda/elements/cuda/conda_build_config.yaml +++ b/.conda/elements/cuda/conda_build_config.yaml @@ -3,6 +3,8 @@ c_compiler: cxx_compiler: - gxx target_platform: - - linux-64 + - linux-64 # [linux] #- linux-aarch64 #- linux-ppc64le + - osx-64 # [osx] + - osx-arm64 # [osx] diff --git a/.conda/elements/cuda/meta.yaml b/.conda/elements/cuda/meta.yaml index 0e47c1102..7d8500dbe 100644 --- a/.conda/elements/cuda/meta.yaml +++ b/.conda/elements/cuda/meta.yaml @@ -14,15 +14,14 @@ build: number: 1 noarch: False script_env: - - PLATFORM={{ target_platform }} # [linux] + - PLATFORM={{ target_platform }} skip: True # [osx] skip: False # [linux] -requirements: # [linux] +requirements: build: - cmake >=3.17.0 - - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux] - #- {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx] + - {{ compiler('cxx') }}={{ linux_compiler_version }} - cuda-toolkit - matar-cuda - openmpi diff --git a/.conda/matar/cuda/conda_build_config.yaml b/.conda/matar/cuda/conda_build_config.yaml index 8ef61a34a..6befd9985 100644 --- a/.conda/matar/cuda/conda_build_config.yaml +++ b/.conda/matar/cuda/conda_build_config.yaml @@ -3,6 +3,8 @@ c_compiler: cxx_compiler: - gxx target_platform: - - linux-64 + - linux-64 # [linux] #- linux-aarch64 #- linux-ppc64le + - osx-64 # [osx] + - osx-arm64 # [osx] diff --git a/.conda/matar/cuda/meta.yaml b/.conda/matar/cuda/meta.yaml index e7df4f34e..df97b86dc 100644 --- a/.conda/matar/cuda/meta.yaml +++ b/.conda/matar/cuda/meta.yaml @@ -14,11 +14,11 @@ build: number: 1 noarch: False script_env: - - PLATFORM={{ target_platform }} # [linux] + - PLATFORM={{ target_platform }} skip: True # [osx] skip: False # [linux] -requirements: #[linux] +requirements: build: - cmake >=3.17.0 - {{ compiler('cxx') }}={{ linux_compiler_version }}