Skip to content

Commit

Permalink
Add cuda-nvcc (#623)
Browse files Browse the repository at this point in the history
* Add cuda nvcc to the requirements and build pipeline
- Enables system-specific optimizations
* Pin nvcc version and add channel to build command
* Bump pre-release version and remove manual build filter
  • Loading branch information
talmo authored Dec 29, 2021
1 parent 7029b76 commit a80208c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ about:
summary: {{ data.get('description') }}

build:
number: 3
number: 0

source:
path: ../
Expand All @@ -32,6 +32,7 @@ requirements:
- python=3.7
- cudatoolkit=11.3.1
- cudnn=8.2.1
- nvidia::cuda-nvcc=11.3
- sleap::tensorflow=2.7.0
- sleap::pyside2=5.14.1
- pillow
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
# branches:
# - main
# - develop
# - talmo/120_fixes


jobs:
Expand Down Expand Up @@ -73,14 +72,14 @@ jobs:
# export DISPLAY=":1"
# xvfb-run pytest tests/
run: |
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/ -c https://conda.anaconda.org/nvidia/
- name: Build conda package (Windows)
if: matrix.os == 'windows-2019'
shell: powershell
run: |
conda activate sleap
pytest tests/
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/ -c https://conda.anaconda.org/nvidia/
# Upload conda package
- name: Login to Anaconda (Ubuntu)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ jobs:
# export DISPLAY=":1"
# xvfb-run pytest tests/
run: |
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/ -c https://conda.anaconda.org/nvidia/
- name: Build conda package (Windows)
if: matrix.os == 'windows-2019'
shell: powershell
run: |
conda activate sleap
pytest tests/
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/
conda build .conda --output-folder build -c https://conda.anaconda.org/sleap/ -c https://conda.anaconda.org/nvidia/
# Upload conda package
- name: Login to Anaconda (Ubuntu)
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dependencies:
- python=3.7
- cudatoolkit=11.3.1
- cudnn=8.2.1
- nvidia::cuda-nvcc=11.3
# - sleap::tensorflow=2.7.0
# - sleap::pyside2=5.14.1
- pillow
Expand Down
2 changes: 1 addition & 1 deletion sleap/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""


__version__ = "1.2.0a1"
__version__ = "1.2.0a2"


def versions():
Expand Down

0 comments on commit a80208c

Please sign in to comment.