Skip to content

Commit 557793b

Browse files
committed
Fix typo s/Numercis/Numerics/ in native library names
Reported in #907 - thanks!
1 parent b90be7e commit 557793b

14 files changed

Lines changed: 20 additions & 20 deletions

build/MathNet.Numerics.MKL.Linux-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</metadata>
2020
<files>
2121
<file src="..\..\out\MKL\Linux\x64\libiomp5.so" target="runtimes\linux-x64\native\libiomp5.so" />
22-
<file src="..\..\out\MKL\Linux\x64\libMathNetNumercisMKL.so" target="runtimes\linux-x64\native\libMathNetNumercisMKL.so" />
22+
<file src="..\..\out\MKL\Linux\x64\libMathNetNumericsMKL.so" target="runtimes\linux-x64\native\libMathNetNumericsMKL.so" />
2323
<file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Linux-x64.targets" />
2424
<file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Linux-x64.targets" />
2525
<file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Linux-x64.targets" />

build/MathNet.Numerics.MKL.Linux-x86.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</metadata>
2020
<files>
2121
<file src="..\..\out\MKL\Linux\x86\libiomp5.so" target="runtimes\linux-x86\native\libiomp5.so" />
22-
<file src="..\..\out\MKL\Linux\x86\libMathNetNumercisMKL.so" target="runtimes\linux-x86\native\libMathNetNumercisMKL.so" />
22+
<file src="..\..\out\MKL\Linux\x86\libMathNetNumericsMKL.so" target="runtimes\linux-x86\native\libMathNetNumericsMKL.so" />
2323
<file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Linux-x86.targets" />
2424
<file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Linux-x86.targets" />
2525
<file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Linux-x86.targets" />

build/MathNet.Numerics.MKL.Linux.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</metadata>
2020
<files>
2121
<file src="..\..\out\MKL\Linux\x64\libiomp5.so" target="runtimes\linux-x64\native\libiomp5.so" />
22-
<file src="..\..\out\MKL\Linux\x64\libMathNetNumercisMKL.so" target="runtimes\linux-x64\native\libMathNetNumercisMKL.so" />
22+
<file src="..\..\out\MKL\Linux\x64\libMathNetNumericsMKL.so" target="runtimes\linux-x64\native\libMathNetNumericsMKL.so" />
2323
<file src="..\..\out\MKL\Linux\x86\libiomp5.so" target="runtimes\linux-x86\native\libiomp5.so" />
24-
<file src="..\..\out\MKL\Linux\x86\libMathNetNumercisMKL.so" target="runtimes\linux-x86\native\libMathNetNumercisMKL.so" />
24+
<file src="..\..\out\MKL\Linux\x86\libMathNetNumericsMKL.so" target="runtimes\linux-x86\native\libMathNetNumericsMKL.so" />
2525
<file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Linux.targets" />
2626
<file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Linux.targets" />
2727
<file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Linux.targets" />

build/MathNet.Numerics.MKL.Win-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</metadata>
2020
<files>
2121
<file src="..\..\out\MKL\Windows\x64\libiomp5md.dll" target="runtimes\win-x64\native\libiomp5md.dll" />
22-
<file src="..\..\out\MKL\Windows\x64\libMathNetNumercisMKL.dll" target="runtimes\win-x64\native\libMathNetNumercisMKL.dll" />
22+
<file src="..\..\out\MKL\Windows\x64\libMathNetNumericsMKL.dll" target="runtimes\win-x64\native\libMathNetNumericsMKL.dll" />
2323
<file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Win-x64.targets" />
2424
<file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Win-x64.targets" />
2525
<file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Win-x64.targets" />

build/MathNet.Numerics.MKL.Win-x86.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</metadata>
2020
<files>
2121
<file src="..\..\out\MKL\Windows\x86\libiomp5md.dll" target="runtimes\win-x86\native\libiomp5md.dll" />
22-
<file src="..\..\out\MKL\Windows\x86\libMathNetNumercisMKL.dll" target="runtimes\win-x86\native\libMathNetNumercisMKL.dll" />
22+
<file src="..\..\out\MKL\Windows\x86\libMathNetNumericsMKL.dll" target="runtimes\win-x86\native\libMathNetNumericsMKL.dll" />
2323
<file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Win-x86.targets" />
2424
<file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Win-x86.targets" />
2525
<file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Win-x86.targets" />

build/MathNet.Numerics.MKL.Win.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</metadata>
2020
<files>
2121
<file src="..\..\out\MKL\Windows\x64\libiomp5md.dll" target="runtimes\win-x64\native\libiomp5md.dll" />
22-
<file src="..\..\out\MKL\Windows\x64\libMathNetNumercisMKL.dll" target="runtimes\win-x64\native\libMathNetNumercisMKL.dll" />
22+
<file src="..\..\out\MKL\Windows\x64\libMathNetNumericsMKL.dll" target="runtimes\win-x64\native\libMathNetNumericsMKL.dll" />
2323
<file src="..\..\out\MKL\Windows\x86\libiomp5md.dll" target="runtimes\win-x86\native\libiomp5md.dll" />
24-
<file src="..\..\out\MKL\Windows\x86\libMathNetNumercisMKL.dll" target="runtimes\win-x86\native\libMathNetNumercisMKL.dll" />
24+
<file src="..\..\out\MKL\Windows\x86\libMathNetNumericsMKL.dll" target="runtimes\win-x86\native\libMathNetNumericsMKL.dll" />
2525
<file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Win.targets" />
2626
<file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Win.targets" />
2727
<file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Win.targets" />

docs/MKL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Default Behavior on Windows
7575

7676
On Windows it is usually enough to make sure the native libraries are in the
7777
same folder as the executable. Reference the appropriate NuGet package and set
78-
"Copy to Output Directory" for both libMathNetNumercisMKL.dll and libiomp5md.dll
78+
"Copy to Output Directory" for both libMathNetNumericsMKL.dll and libiomp5md.dll
7979
to "Copy always", or place the two native DLLs manually into the same directory
8080
as your application's executable. There is no need to set the native provider
8181
path explicitly.
@@ -119,7 +119,7 @@ To build the MKL native provider for OSX:
119119
mkl_build.sh
120120
lionel:OSX Lionel$ sh mkl_build.sh
121121

122-
Check the /x86 and /x64 folders in mathnet-numerics/out/MKL: you should now find the `libiomp5.dylib` and `libMathNetNumercisMKL.dll` libaries.
122+
Check the /x86 and /x64 folders in mathnet-numerics/out/MKL: you should now find the `libiomp5.dylib` and `libMathNetNumericsMKL.dll` libaries.
123123
You need to add the path to the generated libraries in your `DYLD_LIBRARY_PATH` environment variable (which you can move to the folder of you choice before).
124124
To do that, open your /Users/Lionel/.bas_profile.sh file with a text editor and add the following statements.
125125

@@ -190,7 +190,7 @@ and use `ldconfig` to tell where to look for the libraries, but for now we'll ju
190190

191191
[lang=sh]
192192
sudo cp packages/MathNet.Numerics.MKL.Linux-x64.1.3.0/content/libiomp5.so /usr/lib/
193-
sudo cp packages/MathNet.Numerics.MKL.Linux-x64.1.3.0/content/libMathNetNumercisMKL.dll /usr/lib/
193+
sudo cp packages/MathNet.Numerics.MKL.Linux-x64.1.3.0/content/libMathNetNumericsMKL.dll /usr/lib/
194194

195195
Then we're all set and can just call `Control.UseNativeMKL()` if we want to use the native provider.
196196
Let's create the following C# file `Example.cs`:

src/NativeProviders/Linux/mkl_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ export OUT=../../../out/MKL/Linux
77
mkdir -p $OUT/x64
88
mkdir -p $OUT/x86
99

10-
g++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/libMathNetNumercisMKL.so -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp -Wl,--start-group $MKL/lib/intel64/libmkl_intel_lp64.a $MKL/lib/intel64/libmkl_intel_thread.a $MKL/lib/intel64/libmkl_core.a -Wl,--end-group -L$OPENMP/intel64 -liomp5 -lpthread -lm
10+
g++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/libMathNetNumericsMKL.so -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp -Wl,--start-group $MKL/lib/intel64/libmkl_intel_lp64.a $MKL/lib/intel64/libmkl_intel_thread.a $MKL/lib/intel64/libmkl_core.a -Wl,--end-group -L$OPENMP/intel64 -liomp5 -lpthread -lm
1111

1212
cp $OPENMP/intel64/libiomp5.so $OUT/x64/
1313

14-
g++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/libMathNetNumercisMKL.so -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp -Wl,--start-group $MKL/lib/ia32/libmkl_intel.a $MKL/lib/ia32/libmkl_intel_thread.a $MKL/lib/ia32/libmkl_core.a -Wl,--end-group -L$OPENMP/ia32 -liomp5 -lpthread -lm
14+
g++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/libMathNetNumericsMKL.so -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp -Wl,--start-group $MKL/lib/ia32/libmkl_intel.a $MKL/lib/ia32/libmkl_intel_thread.a $MKL/lib/ia32/libmkl_core.a -Wl,--end-group -L$OPENMP/ia32 -liomp5 -lpthread -lm
1515

1616
cp $OPENMP/ia32/libiomp5.so $OUT/x86/

src/NativeProviders/MKL/resource.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ BEGIN
7373
VALUE "FileVersion", "3.0.0.0"
7474
VALUE "InternalName", "Math.NET"
7575
VALUE "LegalCopyright", "Copyright (C) Math.NET 2009-2021"
76-
VALUE "OriginalFilename", "libMathNetNumercisMKL"
76+
VALUE "OriginalFilename", "libMathNetNumericsMKL"
7777
VALUE "ProductName", "Math.NET Numerics"
7878
VALUE "ProductVersion", "3.0.0.0"
7979
END

src/NativeProviders/OSX/mkl_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ export OUT=../../../out/MKL/OSX
66
mkdir -p $OUT/x64
77
mkdir -p $OUT/x86
88

9-
clang++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/libMathNetNumercisMKL.dylib -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
9+
clang++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/libMathNetNumericsMKL.dylib -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
1010

1111
cp $OPENMP/libiomp5.dylib $OUT/x64/
1212

13-
clang++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/libMathNetNumercisMKL.dylib -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
13+
clang++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/libMathNetNumericsMKL.dylib -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
1414

1515
cp $OPENMP/libiomp5.dylib $OUT/x86/

0 commit comments

Comments
 (0)