saymrwulf/pytorch
1
0
Fork 0
mirror of https://github.com/saymrwulf/pytorch.git synced 2026-05-14 20:57:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Caffe2] Turning on ATEN for Caffe2 in integrated builds (#7169)

Browse source 
* Turning on ATEN for Caffe2 in integrated builds

* Adding slim version

* Fixing missing name suffix, fixing conda tests
This commit is contained in:
Paul Jesse Hellemn 2018-05-02 11:16:29 -07:00 committed by GitHub
parent 1904058370
commit 4d2693973e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.jenkins/caffe2/test.sh
View file

@ -93,6 +93,7 @@ fi
# TODO find out why this breaks for conda builds
if [[ $BUILD_ENVIRONMENT == conda* ]]; then
conda_ignore_test="--ignore $CAFFE2_PYPATH/python/tt_core_test.py"
conda_ignore_test="--ignore $CAFFE2_PYPATH/caffe2/python/dataio_test.py"
fi
# Python tests

12
scripts/build_anaconda.sh
View file

@ -157,6 +157,9 @@ while [[ $# -gt 0 ]]; do
--pytorch-too)
pytorch_too=1
;;
--slim)
slim=1
;;
--conda)
shift
conda_build_args+=("$1")
@ -259,7 +262,7 @@ if [[ -n $CUDA_VERSION ]]; then
else
build_string="${build_string}_cpu"
fi
if [[ "$(uname)" != 'Darwin' && -z $pytorch_too && $GCC_USE_C11 -eq 0 ]]; then
if [[ "$(uname)" != 'Darwin' && $GCC_USE_C11 -eq 0 ]]; then
# gcc compatibility is not tracked by conda-forge, so we track it ourselves
package_name="${package_name}_gcc${GCC_VERSION:0:3}"
build_string="${build_string}_gcc${GCC_VERSION:0:3}"
@ -294,7 +297,6 @@ fi
# Add packages required for all Caffe2 builds
add_package 'glog'
add_package 'gflags'
add_package 'opencv'
caffe2_cmake_args+=("-DUSE_LEVELDB=OFF")
caffe2_cmake_args+=("-DUSE_LMDB=OFF")
@ -317,9 +319,15 @@ if [[ -n $pytorch_too ]]; then
add_package $cuda_feature_name
conda_channel+=('-c pytorch')
export BUILD_WITH_CUDA=1
caffe2_cmake_args+=("-DUSE_ATEN=ON")
fi
fi
if [[ -z $slim ]]; then
add_package 'opencv'
fi
# Flags required for CUDA for Caffe2
if [[ -n $CUDA_VERSION ]]; then
caffe2_cmake_args+=("-DUSE_CUDA=ON")