remove reference to acml math library

CNTK.Cpp.props

@@ -34,48 +34,29 @@
     <UseZip Condition="Exists('$(ZLIB_PATH)')">true</UseZip>
   </PropertyGroup>
 
-  <Choose>
+  <PropertyGroup>
-    <When Condition="Exists('$(ACML_PATH)')">
+	<MathLibrary>MKL</MathLibrary>
-      <PropertyGroup>
+	<CNTKCustomMKLVersion>1</CNTKCustomMKLVersion>
-        <MathLibrary>ACML</MathLibrary>
+	<CNTKCustomMKLPath>$(CNTK_MKL_PATH)\$(CNTKCustomMKLVersion)</CNTKCustomMKLPath>
-        <MathLibraryName>ACML</MathLibraryName>
+	<MathIncludePath>$(CNTKCustomMKLPath)\include</MathIncludePath>
-        <MathIncludePath>$(ACML_PATH)\include</MathIncludePath>
+	<MathDefine>USE_MKL</MathDefine>
-        <MathLibraryPath>$(ACML_PATH)\lib</MathLibraryPath>
+  </PropertyGroup>
-        <MathLinkLibrary>libacml_mp_dll.lib</MathLinkLibrary>
+  <PropertyGroup Condition="'$(CNTK_MKL_SEQUENTIAL)' != '1'">
-        <MathDelayLoad>libacml_mp_dll.dll</MathDelayLoad>
+	<MathLibraryName>CNTK custom MKL Parallel (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
-        <MathPostBuildCopyPattern>$(ACML_PATH)\lib\*.dll</MathPostBuildCopyPattern>
+	<MathLibraryPath>$(CNTKCustomMKLPath)\x64\parallel</MathLibraryPath>
-        <UnitTestDlls>$(OutDir)libacml_mp_dll.dll;$(OutDir)libifcoremd.dll;$(OutDir)libifportmd.dll;$(OutDir)libiomp*.dll;$(OutDir)libmmd.dll;$(OutDir)svml_dispmd.dll;</UnitTestDlls>
+	<MathLinkLibrary>mkl_cntk_p.lib</MathLinkLibrary>
-        <MathDefine>USE_ACML</MathDefine>
+	<MathDelayLoad>mkl_cntk_p.dll</MathDelayLoad>
-      </PropertyGroup>
+	<MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
-    </When>
+	<UnitTestDlls>$(OutDir)mkl_cntk_p.dll;$(OutDir)libiomp5md.dll;</UnitTestDlls>
-
+  </PropertyGroup>
-    <!-- See https://github.com/Microsoft/CNTK/wiki/Setup-CNTK-on-Windows#optional-mkl on how to configure to build CNTK with MKL -->
+  <PropertyGroup Condition="'$(CNTK_MKL_SEQUENTIAL)' == '1'">
-    <When Condition="'$(CNTK_MKL)' == '1'">
+	<MathLibraryName>CNTK custom MKL Sequential (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
-      <PropertyGroup>
+	<MathLibraryPath>$(CNTKCustomMKLPath)\x64\sequential</MathLibraryPath>
-        <MathLibrary>MKL</MathLibrary>
+	<MathLinkLibrary>mkl_cntk_s.lib</MathLinkLibrary>
-        <CNTKCustomMKLVersion>1</CNTKCustomMKLVersion>
+	<MathDelayLoad>mkl_cntk_s.dll</MathDelayLoad>
-        <CNTKCustomMKLPath>$(CNTK_MKL_PATH)\$(CNTKCustomMKLVersion)</CNTKCustomMKLPath>
+	<MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
-        <MathIncludePath>$(CNTKCustomMKLPath)\include</MathIncludePath>
+	<UnitTestDlls>$(OutDir)mkl_cntk_s.dll;</UnitTestDlls>
-        <MathDefine>USE_MKL</MathDefine>
+  </PropertyGroup>
-      </PropertyGroup>
-      <PropertyGroup Condition="'$(CNTK_MKL_SEQUENTIAL)' != '1'">
-        <MathLibraryName>CNTK custom MKL Parallel (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
-        <MathLibraryPath>$(CNTKCustomMKLPath)\x64\parallel</MathLibraryPath>
-        <MathLinkLibrary>mkl_cntk_p.lib</MathLinkLibrary>
-        <MathDelayLoad>mkl_cntk_p.dll</MathDelayLoad>
-        <MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
-        <UnitTestDlls>$(OutDir)mkl_cntk_p.dll;$(OutDir)libiomp5md.dll;</UnitTestDlls>
-      </PropertyGroup>
-      <PropertyGroup Condition="'$(CNTK_MKL_SEQUENTIAL)' == '1'">
-        <MathLibraryName>CNTK custom MKL Sequential (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
-        <MathLibraryPath>$(CNTKCustomMKLPath)\x64\sequential</MathLibraryPath>
-        <MathLinkLibrary>mkl_cntk_s.lib</MathLinkLibrary>
-        <MathDelayLoad>mkl_cntk_s.dll</MathDelayLoad>
-        <MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
-        <UnitTestDlls>$(OutDir)mkl_cntk_s.dll;</UnitTestDlls>
-      </PropertyGroup>
-    </When>
-   </Choose>
 
   <PropertyGroup Condition="$(UseZip)">
     <ZipInclude>$(ZLIB_PATH)\include;$(ZLIB_PATH)\lib\libzip\include;</ZipInclude>

Makefile

@@ -9,8 +9,6 @@
 # that provides
 #   BUILDTYPE= One of release or debug
 #     defaults to release
-#   ACML_PATH= path to ACML library installation
-#     only needed if MATHLIB=acml
 #   MKL_PATH= path to CNTK custom MKL installation
 #     only needed if MATHLIB=mkl
 #   CNTK_CUSTOM_MKL_VERSION=2
@@ -21,8 +19,8 @@
 #     defaults to /usr/include/nvidia/gdk
 #   GDK_NVML_LIB_PATH= path to CUDA GDK (stub) library path, so $(GDK_NVML_LIB_PATH)/libnvidia-ml.so exists
 #     defaults to /usr/src/gdk/nvml/lib
-#   MATHLIB= One of acml or mkl
+#   MATHLIB= mkl
-#     defaults to acml
+#     defaults to mkl
 #   CUDA_PATH= Path to CUDA
 #     If not specified, GPU will not be enabled
 #   CUB_PATH= path to NVIDIA CUB installation, so $(CUB_PATH)/cub/cub.cuh exists
@@ -60,8 +58,8 @@ BUILDTYPE=release
 endif
 
 ifndef MATHLIB
-$(info DEFAULTING MATHLIB=acml)
+$(info DEFAULTING MATHLIB=mkl)
-MATHLIB = acml
+MATHLIB = mkl
 endif
 
 #### Configure based on options above
@@ -137,13 +135,6 @@ else
   COMMON_FLAGS +=-DCPUONLY
 endif
 
-ifeq ("$(MATHLIB)","acml")
-  INCLUDEPATH += $(ACML_PATH)/include
-  LIBPATH += $(ACML_PATH)/lib
-  LIBS += -lacml_mp -liomp5 -lm -lpthread
-  COMMON_FLAGS += -DUSE_ACML
-endif
-
 ifeq ("$(MATHLIB)","mkl")
   INCLUDEPATH += $(MKL_PATH)/$(CNTK_CUSTOM_MKL_VERSION)/include
   LIBS += -lm

Source/CNTK/prebuild.bat

@@ -53,8 +53,6 @@ if "%p_CNTK_MKL%" == "1" (
   ) else (
     echo #define _MATHLIB_ "mkl">> buildinfo.h$$
   )
-) else (
-  echo #define _MATHLIB_ "acml">> buildinfo.h$$
 )
 
 echo #define _BUILDER_ "%USERNAME%"     >> buildinfo.h$$