Moving conda/ to caffe2/conda (#2428)

* Moving conda/ to caffe2/conda * fix * Moving caffe2/conda to conda/caffe2
facebookarchive · Mar 27, 2018 · 06454db · 06454db
1 parent aad88be
commit 06454db
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/conda/cuda/build.sh → conda/caffe2/cuda/build.sh b/conda/cuda/build.sh → conda/caffe2/cuda/build.sh
diff --git a/conda/cuda/conda_build_config.yaml → conda/caffe2/cuda/conda_build_config.yaml b/conda/cuda/conda_build_config.yaml → conda/caffe2/cuda/conda_build_config.yaml
diff --git a/conda/cuda/meta.yaml → conda/caffe2/cuda/meta.yaml b/conda/cuda/meta.yaml → conda/caffe2/cuda/meta.yaml
@@ -5,7 +5,7 @@ package:
   version: {{ version }}
 
 source:
-  path: ../..
+  path: ../../..
 
 build:
   number: 0

diff --git a/conda/cuda_full/build.sh → conda/caffe2/cuda_full/build.sh b/conda/cuda_full/build.sh → conda/caffe2/cuda_full/build.sh
diff --git a/conda/cuda_full/conda_build_config.yaml → .../caffe2/cuda_full/conda_build_config.yaml b/conda/cuda_full/conda_build_config.yaml → .../caffe2/cuda_full/conda_build_config.yaml
diff --git a/conda/cuda_full/meta.yaml → conda/caffe2/cuda_full/meta.yaml b/conda/cuda_full/meta.yaml → conda/caffe2/cuda_full/meta.yaml
@@ -5,7 +5,7 @@ package:
   version: {{ version }}
 
 source:
-  path: ../..
+  path: ../../..
 
 build:
   number: 0

diff --git a/conda/no_cuda/build.sh → conda/caffe2/no_cuda/build.sh b/conda/no_cuda/build.sh → conda/caffe2/no_cuda/build.sh
diff --git a/conda/no_cuda/conda_build_config.yaml → conda/caffe2/no_cuda/conda_build_config.yaml b/conda/no_cuda/conda_build_config.yaml → conda/caffe2/no_cuda/conda_build_config.yaml
diff --git a/conda/no_cuda/meta.yaml → conda/caffe2/no_cuda/meta.yaml b/conda/no_cuda/meta.yaml → conda/caffe2/no_cuda/meta.yaml
@@ -5,7 +5,7 @@ package:
   version: {{ version }}
 
 source:
-  path: ../..
+  path: ../../..
 
 build:
   number: 0

diff --git a/scripts/build_anaconda.sh b/scripts/build_anaconda.sh
@@ -77,7 +77,7 @@ fi
 #
 # Pick the correct conda-build folder
 #
-CAFFE2_CONDA_BUILD_DIR="${CAFFE2_ROOT}/conda"
+CAFFE2_CONDA_BUILD_DIR="${CAFFE2_ROOT}/conda/caffe2"
 if [[ "${BUILD_ENVIRONMENT}" == *full* ]]; then
   CAFFE2_CONDA_BUILD_DIR="${CAFFE2_CONDA_BUILD_DIR}/cuda_full"
 elif [[ "${BUILD_ENVIRONMENT}" == *cuda* ]]; then