fix compile problem for torch 1.7.0

Tencent · Mar 24, 2021 · 640a788 · 640a788
1 parent 9b2139e
commit 640a788
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,22 +18,24 @@ cache:
 
 jobs:
   include:
-  - name: "CUDA 10.0"
+  - name: "CUDA 10.0 + TRT 7.0 + Torch 1.3"
     env:
     - CUDA=10.0.130-1
     - CUDA_SHORT=10.0
     - CUDNN_MAJOR=7
     - CUDNN=7.6.5.*
     - TENSORRT=7.0.0
     - UBUNTU_VERSION=ubuntu1804
-  - name: "CUDA 10.2"
+    - TORCH=1.3.1
+  - name: "CUDA 10.2 + TRT 7.2 + Torch 1.7"
     env:
     - CUDA=10.2.89-1
     - CUDA_SHORT=10.2
     - CUDNN_MAJOR=8
     - CUDNN=8.0.4.*
     - TENSORRT=7.2.3
     - UBUNTU_VERSION=ubuntu1804
+    - TORCH=1.7.0
 
 before_install:
   - INSTALLER=cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb
@@ -56,7 +58,7 @@ before_install:
 
 install: 
   - pip3 install --user $(whoami) --upgrade pip
-  - pip3 install torch==1.3.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
+  - pip3 install torch==${TORCH}+cpu -f https://download.pytorch.org/whl/torch_stable.html
 
 before_script:
   - wget https://github.com/Neargye/tensorflow/releases/download/v1.15.0/libtensorflow-cpu-linux-x86_64-1.15.0.tar.gz -O tensorflow.tar.gz

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -233,9 +233,11 @@ if(ENABLE_TORCH)
   endif(MSVC)
 
   message(STATUS "Find Torch VERSION: ${Torch_VERSION}")
-  add_definitions(-DTORCH_VERSION_MAJOR=${Torch_VERSION_MAJOR})
-  add_definitions(-DTORCH_VERSION_MINOR=${Torch_VERSION_MINOR})
-  add_definitions(-DTORCH_VERSION_PATCH=${Torch_VERSION_PATCH})
+  if (${Torch_VERSION} VERSION_GREATER_EQUAL "1.7.0")
+      add_definitions(-DNEW_TORCH_API=1)
+      set(CMAKE_CXX_STANDARD 14)
+      set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  endif()
 
   include_directories(${TORCH_INCLUDE_DIRS})
   add_subdirectory(${PROJECT_SOURCE_DIR}/source/fwd_torch)

diff --git a/source/fwd_torch/CMakeLists.txt b/source/fwd_torch/CMakeLists.txt
@@ -30,7 +30,6 @@ file(GLOB TORCH_CRT_SOURCES torch_cvt/torch_desc_creators/*.h)
 file(GLOB TORCH_PASS_SOURCES torch_cvt/torch_passes/*.h torch_cvt/torch_passes/*.cpp)
 
 add_library(fwd_torch 
-                torch_version.h
                 ${TORCH_LIB_SOURCES}
                 ${TORCH_CVT_SOURCES}
                 ${TORCH_CRT_SOURCES}

diff --git a/source/fwd_torch/torch_cvt/torch_desc_creators/i_torch_layer_creator.h b/source/fwd_torch/torch_cvt/torch_desc_creators/i_torch_layer_creator.h
@@ -32,7 +32,6 @@
 
 #include "common/trt_layer_desc.h"
 #include "fwd_torch/fwd_torch_renaming.h"
-#include "fwd_torch/torch_version.h"
 
 #ifdef _MSC_VER
 // 关闭 Torch 太多的编译警告

diff --git a/source/fwd_torch/torch_cvt/torch_passes/fold_floor_divide.h b/source/fwd_torch/torch_cvt/torch_passes/fold_floor_divide.h
@@ -30,7 +30,6 @@
 
 #include <memory>
 
-#include "fwd_torch/torch_version.h"
 
 #ifdef NEW_TORCH_API
 namespace torch {

diff --git a/source/unit_test/unit_test.h b/source/unit_test/unit_test.h
@@ -42,7 +42,6 @@
 
 #include "fwd_torch/torch_engine/torch_engine.h"
 #include "fwd_torch/torch_engine/torch_infer.h"
-#include "fwd_torch/torch_version.h"
 
 #ifdef _MSC_VER
 const c10::DeviceType device = c10::kCPU;