Fix release packages being overwritten by nightlies. (#1935)

Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1935

Reviewed By: mdouze

Differential Revision: D28932003

Pulled By: beauby

fbshipit-source-id: f6149697a270c07cfef789e7e7f22ba58cb9627c

.circleci/config.yml

@@ -193,6 +193,8 @@ jobs:
             conda config --set anaconda_upload yes
       - run:
           name: Build packages
+          environment:
+            PACKAGE_TYPE: <<parameters.label>>
           command: |
             cd conda
             conda build faiss --user pytorch --label <<parameters.label>>
@@ -217,6 +219,7 @@ jobs:
           command: |
             docker build -t faiss -f conda/Dockerfile.cuda<<parameters.cuda>> .
             docker run --gpus all \
+              -e PACKAGE_TYPE="<<parameters.label>>" \
               -e CUDA_ARCHS="<<parameters.cuda_archs>>" \
               -e ANACONDA_API_TOKEN=$ANACONDA_API_TOKEN \
               faiss \
@@ -246,6 +249,8 @@ jobs:
             curl -L -o - https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.9.sdk.tar.xz | sudo tar xJf - -C /opt
       - run:
           name: Build packages
+          environment:
+            PACKAGE_TYPE: <<parameters.label>>
           command: |
             export PATH=~/miniconda/bin:$PATH
             cd conda
@@ -268,6 +273,8 @@ jobs:
             conda config --set anaconda_upload yes
       - run:
           name: Build packages
+          environment:
+            PACKAGE_TYPE: <<parameters.label>>
           command: |
             cd conda
             conda build faiss --user pytorch --label <<parameters.label>>

conda/faiss-gpu/meta.yaml

@@ -4,6 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 {% set version = environ.get('GIT_DESCRIBE_TAG').lstrip('v') %}
+{% set suffix = "_nightly" if environ.get('PACKAGE_TYPE') == 'nightly' else "" %}
 {% set number = GIT_DESCRIBE_NUMBER %}
 
 package:
@@ -27,7 +28,7 @@ outputs:
   - name: libfaiss
     script: build-lib.sh
     build:
-      string: "h{{ PKG_HASH }}_{{ number }}_cuda{{ cudatoolkit }}"
+      string: "h{{ PKG_HASH }}_{{ number }}_cuda{{ cudatoolkit }}{{ suffix }}"
       run_exports:
         - {{ pin_compatible('libfaiss', exact=True) }}
       script_env:
@@ -55,7 +56,7 @@ outputs:
   - name: faiss-gpu
     script: build-pkg.sh
     build:
-      string: "py{{ PY_VER }}_h{{ PKG_HASH }}_{{ number }}_cuda{{ cudatoolkit }}"
+      string: "py{{ PY_VER }}_h{{ PKG_HASH }}_{{ number }}_cuda{{ cudatoolkit }}{{ suffix }}"
     requirements:
       build:
         - {{ compiler('cxx') }}

conda/faiss/meta.yaml

@@ -4,6 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 {% set version = environ.get('GIT_DESCRIBE_TAG').lstrip('v') %}
+{% set suffix = "_nightly" if environ.get('PACKAGE_TYPE') == 'nightly' else "" %}
 {% set number = GIT_DESCRIBE_NUMBER %}
 
 package:
@@ -28,7 +29,7 @@ outputs:
     script: build-lib.sh   # [not win]
     script: build-lib.bat  # [win]
     build:
-      string: "h{{ PKG_HASH }}_{{ number }}_cpu"
+      string: "h{{ PKG_HASH }}_{{ number }}_cpu{{ suffix }}"
       run_exports:
         - {{ pin_compatible('libfaiss', exact=True) }}
     requirements:
@@ -53,7 +54,7 @@ outputs:
     script: build-pkg.sh   # [not win]
     script: build-pkg.bat  # [win]
     build:
-      string: "py{{ PY_VER }}_h{{ PKG_HASH }}_{{ number }}_cpu"
+      string: "py{{ PY_VER }}_h{{ PKG_HASH }}_{{ number }}_cpu{{ suffix }}"
     requirements:
       build:
         - {{ compiler('cxx') }}