Skip to content

Commit 5222a1b

Browse files
pjh5facebook-github-bot
authored andcommitted
Fixing reading of FBGEMM from env variables
Summary: Pull Request resolved: pytorch#15023 Reviewed By: orionr Differential Revision: D13406778 Pulled By: pjh5 fbshipit-source-id: 2265f01170fb7969cbdf4e44ca6ef183f5d8017d
1 parent a97cf56 commit 5222a1b

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ def hotpatch_var(var, prefix='USE_'):
172172
from tools.setup_helpers.cuda import USE_CUDA, CUDA_HOME, CUDA_VERSION
173173
from tools.setup_helpers.build import (BUILD_BINARY, BUILD_TEST,
174174
BUILD_CAFFE2_OPS, USE_LEVELDB,
175-
USE_LMDB, USE_OPENCV, USE_TENSORRT, USE_FFMPEG)
175+
USE_LMDB, USE_OPENCV, USE_TENSORRT,
176+
USE_FFMPEG, USE_FBGEMM)
176177
from tools.setup_helpers.rocm import USE_ROCM, ROCM_HOME, ROCM_VERSION
177178
from tools.setup_helpers.cudnn import (USE_CUDNN, CUDNN_LIBRARY,
178179
CUDNN_LIB_DIR, CUDNN_INCLUDE_DIR)
179-
from tools.setup_helpers.fbgemm import USE_FBGEMM
180180
from tools.setup_helpers.miopen import (USE_MIOPEN, MIOPEN_LIBRARY,
181181
MIOPEN_LIB_DIR, MIOPEN_INCLUDE_DIR)
182182
from tools.setup_helpers.nccl import USE_NCCL, USE_SYSTEM_NCCL, NCCL_LIB_DIR, \

tools/build_pytorch_libs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fi
5252

5353
# Options for building only a subset of the libraries
5454
USE_CUDA=0
55-
USE_FBGEMM=1
55+
USE_FBGEMM=0
5656
USE_ROCM=0
5757
USE_NNPACK=0
5858
USE_MKLDNN=0

tools/setup_helpers/build.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
USE_OPENCV = check_env_flag('USE_OPENCV')
99
USE_TENSORRT = check_env_flag('USE_TENSORRT')
1010
USE_FFMPEG = check_env_flag('USE_FFMPEG')
11+
USE_FBGEMM = not (check_env_flag('NO_FBGEMM') or check_negative_env_flag('USE_FBGEMM'))

tools/setup_helpers/fbgemm.py

-12
This file was deleted.

0 commit comments

Comments
 (0)