From 1433bc145526949c84acf4ba5eaa1687cc2d72fe Mon Sep 17 00:00:00 2001 From: cyy Date: Thu, 6 Mar 2025 02:56:23 +0000 Subject: [PATCH] Remove CAFFE2_USE_EXCEPTION_PTR (#147247) The check is for older compilers and is now aways true. Pull Request resolved: https://github.com/pytorch/pytorch/pull/147247 Approved by: https://github.com/janeyx99 --- build.bzl | 1 - caffe2/core/macros.h.in | 2 -- cmake/MiscCheck.cmake | 2 -- 3 files changed, 5 deletions(-) diff --git a/build.bzl b/build.bzl index ad8ea1c8cef2..f8bc5acefa6f 100644 --- a/build.bzl +++ b/build.bzl @@ -19,7 +19,6 @@ def define_targets(rules): "CAFFE2_BUILD_SHARED_LIBS", "CAFFE2_PERF_WITH_AVX", "CAFFE2_PERF_WITH_AVX2", - "CAFFE2_USE_EXCEPTION_PTR", "CAFFE2_USE_CUDNN", "USE_MKLDNN", "CAFFE2_USE_ITT", diff --git a/caffe2/core/macros.h.in b/caffe2/core/macros.h.in index 9e2c253ad2aa..9b05d629edec 100644 --- a/caffe2/core/macros.h.in +++ b/caffe2/core/macros.h.in @@ -13,7 +13,6 @@ #cmakedefine CAFFE2_PERF_WITH_AVX2 #cmakedefine CAFFE2_THREADPOOL_MAIN_IMBALANCE #cmakedefine CAFFE2_THREADPOOL_STATS -#cmakedefine CAFFE2_USE_EXCEPTION_PTR #cmakedefine CAFFE2_USE_ACCELERATE #cmakedefine CAFFE2_USE_CUDNN #cmakedefine CAFFE2_USE_EIGEN_FOR_BLAS @@ -57,7 +56,6 @@ {"HAS_MKL_SGEMM_PACK", "${CAFFE2_HAS_MKL_SGEMM_PACK}"}, \ {"PERF_WITH_AVX", "${CAFFE2_PERF_WITH_AVX}"}, \ {"PERF_WITH_AVX2", "${CAFFE2_PERF_WITH_AVX2}"}, \ - {"USE_EXCEPTION_PTR", "${CAFFE2_USE_EXCEPTION_PTR}"}, \ {"USE_ACCELERATE", "${CAFFE2_USE_ACCELERATE}"}, \ {"USE_EIGEN_FOR_BLAS", "${CAFFE2_USE_EIGEN_FOR_BLAS}"}, \ {"USE_LITE_PROTO", "${CAFFE2_USE_LITE_PROTO}"}, \ diff --git a/cmake/MiscCheck.cmake b/cmake/MiscCheck.cmake index 74fc1487333a..871a23487f29 100644 --- a/cmake/MiscCheck.cmake +++ b/cmake/MiscCheck.cmake @@ -2,8 +2,6 @@ include(CheckCXXSourceCompiles) include(CheckCXXCompilerFlag) include(CMakePushCheckState) -set(CAFFE2_USE_EXCEPTION_PTR 1) - # ---[ Check if we want to turn off deprecated warning due to glog. if(USE_GLOG) cmake_push_check_state(RESET)