[GitHub] sandeep-krishnamurthy closed pull request #9940: [MXNET-46]remove set CMAKE_GENERATOR_TOOLSET

[GitBox <gi...@apache.org>]

sandeep-krishnamurthy closed pull request #9940: [MXNET-46]remove set CMAKE_GENERATOR_TOOLSET
URL: https://github.com/apache/incubator-mxnet/pull/9940
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a076524992f..f800097b9ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,10 +51,10 @@ if(USE_CUDA AND NOT USE_OLDCMAKECUDA)
     project(mxnet C CXX CUDA)
   else()
     set(FIRST_CUDA FALSE)
-    set(USE_OLDCMAKECUDA TRUE)
     project(mxnet C CXX)
   endif()
 else()
+  set(FIRST_CUDA FALSE)
   project(mxnet C CXX)
 endif()
 
@@ -187,14 +187,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
 if(USE_CUDA)
   find_package(CUDA REQUIRED)
   add_definitions(-DMSHADOW_USE_CUDA=1)
-  if(FIRST_CUDA AND (NOT USE_OLDCMAKECUDA))
-    if(CUDA_TOOLSET STREQUAL "")
-      set(CUDA_TOOLSET "${CUDA_VERSION_STRING}")
-    endif()
-    set(CMAKE_GENERATOR_TOOLSET "cuda=${CUDA_TOOLSET},host=x64")
-  else()
-    set(FIRST_CUDA FALSE)
-  endif()
   if(USE_NCCL)
     find_package(NCCL)
     if(NCCL_FOUND)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services