Skip to content

Commit

Permalink
Fix conda recipes (#532)
Browse files Browse the repository at this point in the history
- Simplify recipes using `{{ target_platform }}` for `sysroot` package
- Add `nvcc` to `cuspatial` conda recipe

Authors:
  - Jordan Jacobelli (https://github.com/Ethyling)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Mark Harris (https://github.com/harrism)

URL: #532
  • Loading branch information
jjacobelli authored May 24, 2022
1 parent 47ba833 commit 4f0c473
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions conda/recipes/cuspatial/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ c_compiler_version:
cxx_compiler_version:
- 9

cuda_compiler:
- nvcc

sysroot_version:
- "2.17"
7 changes: 5 additions & 2 deletions conda/recipes/cuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set py_version=environ.get('CONDA_PY', 36) %}
{% set cuda_version = '.'.join(environ.get('CUDA', '11.5').split('.')[:2]) %}

package:
name: cuspatial
Expand All @@ -16,13 +17,15 @@ build:
string: py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script_env:
- VERSION_SUFFIX
ignore_run_exports_from:
- {{ compiler('cuda') }}

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- sysroot_linux-64 {{ sysroot_version }} # [linux64]
- sysroot_linux-aarch64 {{ sysroot_version }} # [aarch64]
- {{ compiler('cuda') }} {{ cuda_version }}
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- python
- cython >=0.29,<0.30
Expand Down
9 changes: 3 additions & 6 deletions conda/recipes/libcuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- {{ compiler('cuda') }} {{ cuda_version }}
- sysroot_linux-64 {{ sysroot_version }} # [linux64]
- sysroot_linux-aarch64 {{ sysroot_version }} # [aarch64]
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- libcudf {{ minor_version }}.*
- librmm {{ minor_version }}.*
Expand All @@ -51,8 +50,7 @@ outputs:
run_exports:
- {{ pin_subpackage("libcuspatial", max_pin="x.x") }}
ignore_run_exports_from:
- nvcc_linux-64 # [linux64]
- nvcc_linux-aarch64 # [aarch64]
- {{ compiler('cuda') }}
requirements:
build:
- cmake {{ cmake_version }}
Expand All @@ -77,8 +75,7 @@ outputs:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
ignore_run_exports_from:
- nvcc_linux-64 # [linux64]
- nvcc_linux-aarch64 # [aarch64]
- {{ compiler('cuda') }}
requirements:
build:
- cmake {{ cmake_version }}
Expand Down

0 comments on commit 4f0c473

Please sign in to comment.