move USE_STATIC_DISPATCH from CI script to master cmake (#25696)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/25696

Move the flag from CI to CMake so it's less magic and can be reused by
iOS build as well.

Test Plan: - will check CI

Differential Revision: D17202734

Pulled By: ljk53

fbshipit-source-id: da4f150cbcf2bb5624def386ce3699eff2a7446f
This commit is contained in:
Jiakai Liu 2019-09-05 15:07:11 -07:00 committed by Facebook Github Bot
parent 17e7079aa2
commit 99b6472d6b
3 changed files with 1 additions and 12 deletions

View File

@ -274,11 +274,6 @@ jobs:
NAMED_FLAG="export BUILD_NAMEDTENSOR=1"
fi
# dispatch aten ops statically for mobile
if [[ ${BUILD_ENVIRONMENT} == *"android"* ]]; then
NAMED_FLAG="export USE_STATIC_DISPATCH=1"
fi
export COMMAND='((echo "export BUILD_ENVIRONMENT=${BUILD_ENVIRONMENT}" && echo '"$NAMED_FLAG"' && echo "source ./workspace/env" && echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/build.sh") | docker exec -u jenkins -i "$id" bash) 2>&1'
echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts
@ -350,7 +345,6 @@ jobs:
export COMMAND='((echo "export BUILD_ENVIRONMENT=${BUILD_ENVIRONMENT}" && echo '"$NAMED_FLAG"'&& echo "source ./workspace/env" && echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1'
fi
echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts
caffe2_linux_build:
<<: *caffe2_params
machine:

View File

@ -32,11 +32,6 @@ jobs:
NAMED_FLAG="export BUILD_NAMEDTENSOR=1"
fi
# dispatch aten ops statically for mobile
if [[ ${BUILD_ENVIRONMENT} == *"android"* ]]; then
NAMED_FLAG="export USE_STATIC_DISPATCH=1"
fi
export COMMAND='((echo "export BUILD_ENVIRONMENT=${BUILD_ENVIRONMENT}" && echo '"$NAMED_FLAG"' && echo "source ./workspace/env" && echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/build.sh") | docker exec -u jenkins -i "$id" bash) 2>&1'
echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts
@ -108,4 +103,3 @@ jobs:
export COMMAND='((echo "export BUILD_ENVIRONMENT=${BUILD_ENVIRONMENT}" && echo '"$NAMED_FLAG"'&& echo "source ./workspace/env" && echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1'
fi
echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts

View File

@ -310,6 +310,7 @@ if (INTERN_BUILD_MOBILE AND NOT BUILD_CAFFE2_MOBILE)
set(FEATURE_TORCH_MOBILE ON)
set(NO_API ON)
set(USE_FBGEMM OFF)
set(USE_STATIC_DISPATCH ON)
endif()
# ---[ Utils