frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-21 05:34:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix torch.config can't respect USE_MKLDNN flag issue (#75001)

Browse Source 
Fixes https://github.com/pytorch/pytorch/issues/74949, which reports that torch.config can't respect USE_MKLDNN flag.

Pull Request resolved: https://github.com/pytorch/pytorch/pull/75001
Approved by: https://github.com/malfet
This commit is contained in:
zhang, xiaobing
2022-07-17 15:00:47 +00:00
committed by PyTorch MergeBot
parent 4655c3bace
commit 86b86202b5
22 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
caffe2/CMakeLists.txt
View File

@ -2054,7 +2054,7 @@ if(BUILD_PYTHON)
target_link_libraries(caffe2_pybind11_state PRIVATE
torch_library python::python pybind::pybind11)
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
target_link_libraries(caffe2_pybind11_state PRIVATE caffe2::mkldnn)
endif()
if(WIN32)

2
caffe2/contrib/ideep/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
message(STATUS "Including IDEEP operators")
# ---[ CPU files.

4
caffe2/contrib/warpctc/ctc_op.cpp
View File

@ -2,7 +2,7 @@
#include "caffe2/core/context_gpu.h"
#include "caffe2/core/operator.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -25,7 +25,7 @@ REGISTER_CPU_OPERATOR(CTC, CTCOp<float, CPUContext>);
OPERATOR_SCHEMA(CTC).NumInputs(3, 4).NumOutputs(2, 3);
// .EnforceInputOutputGradient({{0, 0}});
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(CTC, IDEEPFallbackOp<CTCOp<float, CPUContext>>);
#endif

4
caffe2/core/macros.h.in
View File

@ -40,7 +40,7 @@ static_assert(
#cmakedefine CAFFE2_USE_GOOGLE_GLOG
#cmakedefine CAFFE2_USE_LITE_PROTO
#cmakedefine CAFFE2_USE_MKL
#cmakedefine CAFFE2_USE_MKLDNN
#cmakedefine USE_MKLDNN
#cmakedefine CAFFE2_USE_NVTX
#cmakedefine CAFFE2_USE_ITT
#cmakedefine CAFFE2_USE_TRT
@ -81,7 +81,7 @@ static_assert(
{"USE_EIGEN_FOR_BLAS", "${CAFFE2_USE_EIGEN_FOR_BLAS}"}, \
{"USE_LITE_PROTO", "${CAFFE2_USE_LITE_PROTO}"}, \
{"USE_MKL", "${CAFFE2_USE_MKL}"}, \
{"USE_MKLDNN", "${CAFFE2_USE_MKLDNN}"}, \
{"USE_MKLDNN", "${USE_MKLDNN}"}, \
{"USE_NVTX", "${CAFFE2_USE_NVTX}"}, \
{"USE_ITT", "${CAFFE2_USE_ITT}"}, \
{"USE_TRT", "${CAFFE2_USE_TRT}"}, \

2
caffe2/ideep/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
message(STATUS "Including IDEEP operators")
# ---[ CPU files.

4
caffe2/image/image_input_op.cc
View File

@ -1,6 +1,6 @@
#include "caffe2/image/image_input_op.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -160,7 +160,7 @@ The dimension of the output image will always be cropxcrop
NO_GRADIENT(ImageInput);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(ImageInput, IDEEPFallbackOp<ImageInputOp<CPUContext>>);
#endif

4
caffe2/operators/atomic_ops.cc
View File

@ -3,7 +3,7 @@
#include "caffe2/core/context.h"
#include "caffe2/core/operator.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -97,7 +97,7 @@ REGISTER_CPU_OPERATOR(CreateMutex, CreateMutexOp);
REGISTER_CPU_OPERATOR(AtomicFetchAdd, AtomicFetchAddOp<int32_t>);
REGISTER_CPU_OPERATOR(AtomicFetchAdd64, AtomicFetchAddOp<int64_t>);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
CreateMutex,
IDEEPFallbackOp<CreateMutexOp, SkipIndices<0>>);

4
caffe2/operators/batch_permutation_op.cc
View File

@ -3,7 +3,7 @@
#include <cstring>
#include <vector>
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -89,7 +89,7 @@ bool BatchPermutationGradientOp<float, CPUContext>::RunOnDevice() {
return true;
}
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
BatchPermutation,
IDEEPFallbackOp<BatchPermutationOp<float, CPUContext>>);

4
caffe2/operators/distance_op.cc
View File

@ -1,7 +1,7 @@
#include "caffe2/operators/distance_op.h"
#include "caffe2/core/types.h"
#include "caffe2/utils/eigen_utils.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -420,7 +420,7 @@ REGISTER_CPU_OPERATOR(L1Distance, L1DistanceOp<float, CPUContext>);
REGISTER_CPU_OPERATOR(
L1DistanceGradient,
L1DistanceGradientOp<float, CPUContext>);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
L1DistanceGradient,
IDEEPFallbackOp<L1DistanceGradientOp<float, CPUContext>>);

4
caffe2/operators/resize_3d_op.cc
View File

@ -2,7 +2,7 @@
#include "caffe2/utils/math.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include "caffe2/ideep/operators/operator_fallback_ideep.h"
#include "caffe2/ideep/utils/ideep_operator.h"
#endif
@ -165,7 +165,7 @@ REGISTER_CPU_GRADIENT_OPERATOR(
ResizeNearest3DGradient,
ResizeNearest3DGradientOp<float, CPUContext>);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
ResizeNearest3D,
IDEEPFallbackOp<ResizeNearest3DOp<float, CPUContext>>);

4
caffe2/operators/resize_op.cc
View File

@ -3,7 +3,7 @@
#include "caffe2/utils/cpu_neon.h"
#include "caffe2/utils/math.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include "caffe2/ideep/operators/operator_fallback_ideep.h"
#include "caffe2/ideep/utils/ideep_operator.h"
#endif
@ -297,7 +297,7 @@ REGISTER_CPU_GRADIENT_OPERATOR(
ResizeNearestGradient,
ResizeNearestGradientOp<float, CPUContext>);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
ResizeNearest,
IDEEPFallbackOp<ResizeNearestOp<float, CPUContext>>);

4
caffe2/operators/stylizer_ops.cc
View File

@ -2,7 +2,7 @@
#include "caffe2/utils/cpu_neon.h"
#include "caffe2/utils/math.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -584,7 +584,7 @@ OPERATOR_SCHEMA(BRGNCHWCToPackedInt8BGRAStylizerDeprocess)
.NumInputs(2)
.NumOutputs(1);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
BRGNCHWCToPackedInt8BGRAStylizerDeprocess,
IDEEPFallbackOp<BRGNCHWCToPackedInt8BGRAStylizerDeprocessOp, SkipIndices<0>>);

6
caffe2/opt/optimize_ideep.cc
View File

@ -1,7 +1,7 @@
#include "caffe2/opt/optimize_ideep.h"
#include "caffe2/opt/converter.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <cpuinfo.h>
#include "caffe2/ideep/ideep_utils.h"
#endif
@ -11,7 +11,7 @@ namespace opt {
using namespace nom;
#ifndef CAFFE2_USE_MKLDNN
#ifndef USE_MKLDNN
void OptimizeForMkldnn(
repr::NNModule* nn,
caffe2::Workspace* ws,
@ -1012,7 +1012,7 @@ void OptimizeForMkldnn(
setPoolingInferenceMode(nn);
}
#endif // CAFFE2_USE_MKLDNN
#endif // USE_MKLDNN
} // namespace opt
} // namespace caffe2

2
caffe2/python/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(Caffe2_CPU_PYTHON_SRCS
"/pybind_state_int8.cc"
)
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
set(Caffe2_CPU_PYTHON_SRCS
${Caffe2_CPU_PYTHON_SRCS}
"/pybind_state_ideep.cc"

6
caffe2/python/pybind_state.cc
View File

@ -1057,11 +1057,11 @@ void addGlobalMethods(py::module& m) {
m.attr("has_mkldnn") = py::bool_(false);
m.attr("use_mkldnn") = py::bool_(
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
true
#else // CAFFE2_USE_MKLDNN
#else // USE_MKLDNN
false
#endif // CAFFE2_USE_MKLDNN
#endif // USE_MKLDNN
);
// if the binary is built with USE_ROCM, this is a ROCm build

4
caffe2/queue/blobs_queue_db.cc
View File

@ -10,7 +10,7 @@
#include "caffe2/core/operator.h"
#include "caffe2/queue/blobs_queue.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -42,7 +42,7 @@ class CreateBlobsQueueDBOp : public Operator<CPUContext> {
REGISTER_CPU_OPERATOR(CreateBlobsQueueDB, CreateBlobsQueueDBOp<CPUContext>);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
CreateBlobsQueueDB,
IDEEPFallbackOp<CreateBlobsQueueDBOp<CPUContext>, SkipIndices<0>>);

4
caffe2/sgd/iter_op.cc
View File

@ -1,6 +1,6 @@
#include "caffe2/sgd/iter_op.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include <caffe2/ideep/operators/operator_fallback_ideep.h>
#include <caffe2/ideep/utils/ideep_operator.h>
#endif
@ -28,7 +28,7 @@ void MutexDeserializer::Deserialize(const BlobProto& /* unused */, Blob* blob) {
REGISTER_CPU_OPERATOR(Iter, IterOp<CPUContext>);
REGISTER_CPU_OPERATOR(AtomicIter, AtomicIterOp<CPUContext>);
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(AtomicIter, IDEEPFallbackOp<AtomicIterOp<CPUContext>>);
#endif

3
cmake/Dependencies.cmake
View File

@ -1771,7 +1771,6 @@ if(NOT INTERN_BUILD_MOBILE)
endif()
set(AT_MKLDNN_ENABLED 0)
set(CAFFE2_USE_MKLDNN OFF)
if(USE_MKLDNN)
if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
message(WARNING
@ -1787,11 +1786,11 @@ if(NOT INTERN_BUILD_MOBILE)
set(AT_MKLDNN_ENABLED 1)
include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR})
if(BUILD_CAFFE2_OPS)
set(CAFFE2_USE_MKLDNN ON)
list(APPEND Caffe2_DEPENDENCY_LIBS caffe2::mkldnn)
endif(BUILD_CAFFE2_OPS)
else()
message(WARNING "MKLDNN could not be found.")
caffe2_update_option(USE_MKLDNN OFF)
endif()
else()
message("disabling MKLDNN because USE_MKLDNN is not set")

2
cmake/Summary.cmake
View File

@ -142,7 +142,7 @@ function(caffe2_print_configuration_summary)
message(STATUS " USE_FFTW : ${USE_FFTW}")
message(STATUS " USE_MKL : ${CAFFE2_USE_MKL}")
message(STATUS " USE_MKLDNN : ${USE_MKLDNN}")
if(${CAFFE2_USE_MKLDNN})
if(${USE_MKLDNN})
message(STATUS " USE_MKLDNN_ACL : ${USE_MKLDNN_ACL}")
message(STATUS " USE_MKLDNN_CBLAS : ${USE_MKLDNN_CBLAS}")
endif()

6
modules/detectron/CMakeLists.txt
View File

@ -17,7 +17,7 @@ if(BUILD_CAFFE2_OPS)
torch_set_target_props(caffe2_detectron_ops_gpu)
target_link_libraries(caffe2_detectron_ops_gpu PRIVATE torch ${OpenMP_link})
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
target_link_libraries(caffe2_detectron_ops_gpu PRIVATE caffe2::mkldnn)
endif()
install(TARGETS caffe2_detectron_ops_gpu DESTINATION lib)
@ -33,7 +33,7 @@ if(BUILD_CAFFE2_OPS)
${Detectron_HIP_SRCS})
torch_set_target_props(caffe2_detectron_ops_hip)
target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS})
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn)
endif()
target_link_libraries(caffe2_detectron_ops_hip PRIVATE torch)
@ -46,7 +46,7 @@ if(BUILD_CAFFE2_OPS)
endif()
torch_set_target_props(caffe2_detectron_ops)
target_link_libraries(caffe2_detectron_ops PRIVATE torch ${OpenMP_link})
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
target_link_libraries(caffe2_detectron_ops PRIVATE caffe2::mkldnn)
endif()
install(TARGETS caffe2_detectron_ops DESTINATION lib)

4
modules/detectron/upsample_nearest_op.cc
View File

@ -15,13 +15,13 @@
*/
#include "upsample_nearest_op.h"
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
#include "caffe2/ideep/operators/operator_fallback_ideep.h"
#include "caffe2/ideep/utils/ideep_operator.h"
#endif
namespace caffe2 {
#ifdef CAFFE2_USE_MKLDNN
#ifdef USE_MKLDNN
REGISTER_IDEEP_OPERATOR(
UpsampleNearest,
IDEEPFallbackOp<UpsampleNearestOp<float, CPUContext>>);

2
test/cpp/jit/CMakeLists.txt
View File

@ -119,7 +119,7 @@ if(USE_SYSTEM_ONNX)
target_link_libraries(test_jit PRIVATE onnx_proto onnx)
endif()
if(CAFFE2_USE_MKLDNN)
if(USE_MKLDNN)
target_link_libraries(test_jit PRIVATE caffe2::mkldnn)
endif()