diff --git a/src/NativeProviders/Common/wrapper_common.h b/src/NativeProviders/Common/wrapper_common.h index e3f01e46..b4af66d5 100644 --- a/src/NativeProviders/Common/wrapper_common.h +++ b/src/NativeProviders/Common/wrapper_common.h @@ -2,7 +2,7 @@ #define WRAPPER_COMMON_H #ifndef __MS_VC_INSTALL_PATH -#define __MS_VC_INSTALL_PATH C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.14.26428 +#define __MS_VC_INSTALL_PATH C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.15.26726 #endif #ifdef _WINDOWS diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj index 3950f5bd..8cee97e4 100644 --- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj +++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj @@ -30,7 +30,7 @@ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F} MKLWrapper MKL - 10.0.10586.0 + 10.0.17134.0 @@ -99,43 +99,43 @@ $(ProjectDir)..\..\..\..\out\MKL\Windows\x86\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath) - $(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\ia32_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\ia32_win;$(LibraryPath) + $(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath) + $(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\ia32_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\ia32_win;$(LibraryPath) $(ProjectDir)..\..\..\..\out\MKL\Windows\x86\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath) - $(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\ia32_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\ia32_win;$(LibraryPath) + $(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath) + $(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\ia32_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\ia32_win;$(LibraryPath) $(ProjectDir)..\..\..\..\out\MKL\Windows\x64\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\intel64_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\intel64_win;$(LibraryPath) - $(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath) + $(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\intel64_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\intel64_win;$(LibraryPath) + $(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath) $(ProjectDir)..\..\..\..\out\MKL\Windows\x64\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath) - $(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\intel64_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\intel64_win;$(LibraryPath) + $(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath) + $(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\intel64_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\intel64_win;$(LibraryPath) $(ProjectDir)..\..\..\..\out\MKL\Windows\x86\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath) - $(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\ia32_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\ia32_win;$(LibraryPath) + $(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath) + $(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\ia32_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\ia32_win;$(LibraryPath) $(ProjectDir)..\..\..\..\out\MKL\Windows\x64\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath) - $(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\intel64_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\intel64_win;$(LibraryPath) + $(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath) + $(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\intel64_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\intel64_win;$(LibraryPath) @@ -321,4 +321,4 @@ - + \ No newline at end of file