Skip to content
This repository was archived by the owner on Apr 28, 2023. It is now read-only.

Commit cfbf098

Browse files
authored
Merge pull request #150 from facebookresearch/conda-build
Recursive chown and create a conda env
2 parents d09014c + 02c9c32 commit cfbf098

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.jenkins/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ source /etc/lsb-release
1111
if [[ "$DISTRIB_RELEASE" == 14.04 ]]; then
1212
if [[ $(conda --version | wc -c) -ne 0 ]]; then
1313
echo "Building TC in conda env"
14-
source activate
14+
conda create -y --name tc-env python=3.6
15+
source activate tc-env
1516
conda install -y -c pytorch pytorch
1617
conda install -y pyyaml
1718
WITH_PYTHON_C2=OFF CORES=$(nproc) CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
@@ -24,7 +25,8 @@ fi
2425
if [[ "$DISTRIB_RELEASE" == 16.04 ]]; then
2526
if [[ $(conda --version | wc -c) -ne 0 ]]; then
2627
echo "Building TC in conda env"
27-
source activate
28+
conda create -y --name tc-env python=3.6
29+
source activate tc-env
2830
conda install -y pytorch cuda90 -c pytorch
2931
conda install -y pyyaml
3032
WITH_PYTHON_C2=OFF CORES=$(nproc) CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all

.jenkins/run_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [[ "$DISTRIB_RELEASE" == 14.04 ]]; then
1212
echo "Running TC backend tests"
1313
./test.sh
1414
if [[ $(conda --version | wc -c) -ne 0 ]]; then
15-
source activate
15+
source activate tc-env
1616
echo "Running TC PyTorch tests"
1717
./test_python/run_test.sh
1818
fi
@@ -21,7 +21,7 @@ fi
2121
if [[ "$DISTRIB_RELEASE" == 16.04 ]]; then
2222
if [[ $(conda --version | wc -c) -ne 0 ]]; then
2323
echo "Running TC PyTorch tests"
24-
source activate
24+
source activate tc-env
2525
./test_python/run_test.sh
2626
else
2727
echo "Running TC backend tests"

docker/common/add_jenkins_user.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ chown jenkins:jenkins /usr/local
2121
# Allow writing to conda root env
2222
if [[ "$BUILD_ENVIRONMENT" == *-conda* ]]; then
2323
echo "Chowning Conda"
24-
chown jenkins:jenkins /opt/conda
24+
chown -R jenkins:jenkins /opt/conda
2525
fi
2626

2727
# Allow sudo

0 commit comments

Comments
 (0)