From a80208cf7eabc8a64d5118a885c6672a86e8b5b7 Mon Sep 17 00:00:00 2001
From: Talmo Pereira <talmo@princeton.edu>
Date: Wed, 29 Dec 2021 01:45:08 -0800
Subject: [PATCH] Add cuda-nvcc (#623)

* 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
---
 .conda/meta.yaml                   | 3 ++-
 .github/workflows/build.yml        | 5 ++---
 .github/workflows/build_manual.yml | 4 ++--
 environment.yml                    | 1 +
 sleap/version.py                   | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.conda/meta.yaml b/.conda/meta.yaml
index ce345dc70..5251c3a81 100644
--- a/.conda/meta.yaml
+++ b/.conda/meta.yaml
@@ -16,7 +16,7 @@ about:
   summary: {{ data.get('description') }}
 
 build:
-  number: 3
+  number: 0
 
 source:
   path: ../
@@ -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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 177ffcf45..b78bb3dd6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,6 @@ on:
     # branches:
     #   - main
     #   - develop
-    #   - talmo/120_fixes
 
 
 jobs:
@@ -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)
diff --git a/.github/workflows/build_manual.yml b/.github/workflows/build_manual.yml
index 42ce3bb85..f8a63e990 100644
--- a/.github/workflows/build_manual.yml
+++ b/.github/workflows/build_manual.yml
@@ -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)
diff --git a/environment.yml b/environment.yml
index d16c0a777..83f6ee1f2 100644
--- a/environment.yml
+++ b/environment.yml
@@ -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
diff --git a/sleap/version.py b/sleap/version.py
index 9cc00ffc2..703fbe219 100644
--- a/sleap/version.py
+++ b/sleap/version.py
@@ -12,7 +12,7 @@
 """
 
 
-__version__ = "1.2.0a1"
+__version__ = "1.2.0a2"
 
 
 def versions():