mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-06 12:20:52 +01:00
remove unused CAFFE2_VERSION macros (#97337)
remove unused CAFFE2_VERSION macros Summary: Nothing reads these and they are completely subsumed by TORCH_VERSION. Getting rid of these will be helpful for build unification, since they are also not used internally. Test Plan: Rely on CI. Reviewers: sahanp Subscribers: Tasks: Tags: Pull Request resolved: https://github.com/pytorch/pytorch/pull/97337 Approved by: https://github.com/malfet
This commit is contained in:
parent
605a77fd59
commit
5f5d675587
|
|
@ -679,7 +679,6 @@ exclude_patterns = [
|
|||
'cmake/Modules_CUDA_fix/**',
|
||||
'cmake/Caffe2Config.cmake.in',
|
||||
'aten/src/ATen/ATenConfig.cmake.in',
|
||||
'cmake/Caffe2ConfigVersion.cmake.in',
|
||||
'cmake/TorchConfig.cmake.in',
|
||||
'cmake/TorchConfigVersion.cmake.in',
|
||||
'cmake/cmake_uninstall.cmake.i',
|
||||
|
|
|
|||
|
|
@ -463,9 +463,6 @@ header_template_rule(
|
|||
src = "caffe2/core/macros.h.in",
|
||||
out = "caffe2/core/macros.h",
|
||||
substitutions = {
|
||||
"@CAFFE2_VERSION_MAJOR@": "1",
|
||||
"@CAFFE2_VERSION_MINOR@": "3",
|
||||
"@CAFFE2_VERSION_PATCH@": "0",
|
||||
"cmakedefine": "define",
|
||||
"#define CAFFE2_FORCE_FALLBACK_CUDA_MPI": "/* #undef CAFFE2_FORCE_FALLBACK_CUDA_MPI */",
|
||||
"#define CAFFE2_HAS_MKL_DNN": "/* #undef CAFFE2_HAS_MKL_DNN */",
|
||||
|
|
|
|||
|
|
@ -1098,16 +1098,11 @@ endif()
|
|||
# files for shared lib installation. For more info, read:
|
||||
# https://cmake.org/pipermail/cmake/2016-May/063400.html
|
||||
if(BUILD_SHARED_LIBS)
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Caffe2ConfigVersion.cmake.in
|
||||
${PROJECT_BINARY_DIR}/Caffe2ConfigVersion.cmake
|
||||
@ONLY)
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Caffe2Config.cmake.in
|
||||
${PROJECT_BINARY_DIR}/Caffe2Config.cmake
|
||||
@ONLY)
|
||||
install(FILES
|
||||
${PROJECT_BINARY_DIR}/Caffe2ConfigVersion.cmake
|
||||
${PROJECT_BINARY_DIR}/Caffe2Config.cmake
|
||||
DESTINATION share/cmake/Caffe2
|
||||
COMPONENT dev)
|
||||
|
|
|
|||
|
|
@ -5,24 +5,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
// Caffe2 version. The plan is to increment the minor version every other week
|
||||
// as a track point for bugs, until we find a proper versioning cycle.
|
||||
|
||||
#define CAFFE2_VERSION_MAJOR @CAFFE2_VERSION_MAJOR@
|
||||
#define CAFFE2_VERSION_MINOR @CAFFE2_VERSION_MINOR@
|
||||
#define CAFFE2_VERSION_PATCH @CAFFE2_VERSION_PATCH@
|
||||
|
||||
static_assert(
|
||||
CAFFE2_VERSION_MINOR < 100,
|
||||
"Programming error: you set a minor version that is too big.");
|
||||
static_assert(
|
||||
CAFFE2_VERSION_PATCH < 100,
|
||||
"Programming error: you set a patch version that is too big.");
|
||||
|
||||
#define CAFFE2_VERSION \
|
||||
(CAFFE2_VERSION_MAJOR * 10000 + CAFFE2_VERSION_MINOR * 100 + \
|
||||
CAFFE2_VERSION_PATCH)
|
||||
|
||||
#cmakedefine CAFFE2_BUILD_SHARED_LIBS
|
||||
#cmakedefine CAFFE2_FORCE_FALLBACK_CUDA_MPI
|
||||
#cmakedefine CAFFE2_HAS_MKL_DNN
|
||||
|
|
|
|||
|
|
@ -5,11 +5,6 @@
|
|||
|
||||
# library version information
|
||||
|
||||
set(CAFFE2_VERSION_MAJOR @CAFFE2_VERSION_MAJOR@)
|
||||
set(CAFFE2_VERSION_MINOR @CAFFE2_VERSION_MINOR@)
|
||||
set(CAFFE2_VERSION_PATCH @CAFFE2_VERSION_PATCH@)
|
||||
set(CAFFE2_VERSION "@CAFFE2_VERSION@")
|
||||
|
||||
# Utils functions.
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/public/utils.cmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
set(PACKAGE_VERSION "@CAFFE2_VERSION@")
|
||||
|
||||
# Check whether the requested PACKAGE_FIND_VERSION is compatible
|
||||
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
||||
if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
|
||||
set(PACKAGE_VERSION_EXACT TRUE)
|
||||
endif()
|
||||
endif()
|
||||
|
|
@ -23,7 +23,6 @@ function(caffe2_print_configuration_summary)
|
|||
message(STATUS "")
|
||||
|
||||
message(STATUS " TORCH_VERSION : ${TORCH_VERSION}")
|
||||
message(STATUS " CAFFE2_VERSION : ${CAFFE2_VERSION}")
|
||||
message(STATUS " BUILD_CAFFE2 : ${BUILD_CAFFE2}")
|
||||
message(STATUS " BUILD_CAFFE2_OPS : ${BUILD_CAFFE2_OPS}")
|
||||
message(STATUS " BUILD_STATIC_RUNTIME_BENCHMARK: ${BUILD_STATIC_RUNTIME_BENCHMARK}")
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user