minor improvement/fixes

prime9 · Jul 13, 2017 · ce44b81 · ce44b81
1 parent bfc662d
commit ce44b81
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 23 deletions.
diff --git a/CNTK.Cpp.props b/CNTK.Cpp.props
@@ -18,7 +18,7 @@
     <!-- see http://docs.nvidia.com/cuda/pascal-compatibility-guide/index.html#building-applications-with-pascal-support -->
     <NvidiaCompute Condition="$(DebugBuild)">compute_30,sm_30</NvidiaCompute>
     <NvidiaCompute Condition="$(ReleaseBuild) And '$(CudaVersion)' == '7.5'">compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;</NvidiaCompute>
-    <NvidiaCompute Condition="$(ReleaseBuild) And '$(CudaVersion)' == '8.0'">compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_61,sm_61;</NvidiaCompute>
+    <NvidiaCompute Condition="$(ReleaseBuild) And '$(CudaVersion)' == '8.0'">compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_60,sm_60;compute_61,sm_61;</NvidiaCompute>
 
     <NvmlDll>%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml.dll</NvmlDll>
     <NvmlDll Condition="Exists('c:\local\bindrop\NVSMI\nvml.dll')">c:\local\bindrop\NVSMI\nvml.dll</NvmlDll>

diff --git a/Makefile b/Makefile
@@ -234,11 +234,7 @@ ifdef CNTK_CODE_COVERAGE
 endif
 
 ifeq ("$(BUILDTYPE)","debug")
-  ifdef CNTK_CUDA_CODEGEN_DEBUG
-    GENCODE_FLAGS := $(CNTK_CUDA_CODEGEN_DEBUG)
-  else
-    GENCODE_FLAGS := $(GENCODE_SM30)
-  endif
+  GENCODE_FLAGS := $(GENCODE_SM30)
 
   CXXFLAGS += -g
   LDFLAGS += -rdynamic
@@ -247,11 +243,7 @@ ifeq ("$(BUILDTYPE)","debug")
 endif
 
 ifeq ("$(BUILDTYPE)","release")
-  ifdef CNTK_CUDA_CODEGEN_RELEASE
-    GENCODE_FLAGS := $(CNTK_CUDA_CODEGEN_RELEASE)
-  else
-    GENCODE_FLAGS := $(GENCODE_SM30) $(GENCODE_SM35) $(GENCODE_SM50) $(GENCODE_SM52) $(GENCODE_SM60) $(GENCODE_SM61)
-  endif
+  GENCODE_FLAGS := $(GENCODE_SM30) $(GENCODE_SM35) $(GENCODE_SM50) $(GENCODE_SM52) $(GENCODE_SM60) $(GENCODE_SM61)
 
   CXXFLAGS += -g -O4
   LDFLAGS += -rdynamic

diff --git a/Source/Math/Math.vcxproj b/Source/Math/Math.vcxproj
@@ -124,7 +124,7 @@
     <CudaCompile>
       <FastMath>true</FastMath>
       <TargetMachinePlatform>64</TargetMachinePlatform>
-      <CodeGeneration>compute_30,sm_30;compute_35,sm_35;$(NvidiaCompute)</CodeGeneration>
+      <CodeGeneration>$(NvidiaCompute)</CodeGeneration>
       <GPUDebugInfo>true</GPUDebugInfo>
       <GenerateLineInfo>true</GenerateLineInfo>
       <HostDebugInfo>true</HostDebugInfo>

diff --git a/Source/Math/MathCUDA.vcxproj b/Source/Math/MathCUDA.vcxproj
@@ -54,14 +54,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="$(DebugBuild)">
-    <CudaCodeGen>$(CNTK_CUDA_CODEGEN_DEBUG)</CudaCodeGen>
-    <CudaCodeGen Condition="'$(CudaCodeGen)'==''">$(NvidiaCompute)</CudaCodeGen>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(ReleaseBuild)">
-    <CudaCodeGen>$(CNTK_CUDA_CODEGEN_RELEASE)</CudaCodeGen>
-    <CudaCodeGen Condition="'$(CudaCodeGen)'==''">$(NvidiaCompute)</CudaCodeGen>
-  </PropertyGroup>
   <PropertyGroup>
     <TargetName>Cntk.Math.Cuda-$(CntkComponentVersion)</TargetName>
   </PropertyGroup>
@@ -86,7 +78,7 @@
       <TargetMachinePlatform>64</TargetMachinePlatform>
       <GenerateLineInfo>true</GenerateLineInfo>
       <AdditionalCompilerOptions>/WX</AdditionalCompilerOptions>
-      <CodeGeneration>$(CudaCodeGen)</CodeGeneration>
+      <CodeGeneration>$(NvidiaCompute)</CodeGeneration>
       <FastMath>true</FastMath>
       <GPUDebugInfo>false</GPUDebugInfo>
       <GPUDebugInfo Condition="'$(CNTK_CUDA_DEVICE_DEBUGINFO)'=='1'">true</GPUDebugInfo>

diff --git a/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj b/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj
@@ -74,7 +74,7 @@
     </Link>
     <CudaCompile>
       <TargetMachinePlatform>64</TargetMachinePlatform>
-      <CodeGeneration>%(CodeGeneration)</CodeGeneration>
+      <CodeGeneration>$(NvidiaCompute)</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="$(ReleaseBuild)">

diff --git a/Tests/UnitTests/MathTests/MathTests.vcxproj b/Tests/UnitTests/MathTests/MathTests.vcxproj
@@ -81,7 +81,7 @@
     </Link>
     <CudaCompile>
       <TargetMachinePlatform>64</TargetMachinePlatform>
-      <CodeGeneration>compute_30,sm_30;%(CodeGeneration)</CodeGeneration>
+      <CodeGeneration>$(NvidiaCompute)</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="$(ReleaseBuild)">