diff --git a/arionum-miner/src/main/bin/pick-argon.bat b/arionum-miner/src/main/bin/pick-argon.bat index 054bce3..4d6ec3c 100644 --- a/arionum-miner/src/main/bin/pick-argon.bat +++ b/arionum-miner/src/main/bin/pick-argon.bat @@ -1,10 +1,9 @@ +@Echo OFF echo This runscript will attempt to pick the best custom version of argon2i for use with this miner. echo It will also modify the run.bat file to use the built version of argon2i. echo Note that this script will launch a powershell in administrator mode. Please give it permission. -sleep 5 - -@Echo OFF +pause set scriptFileName=%~n0 set scriptFolderPath=%~dp0 diff --git a/arionum-miner/src/main/bin/pick-argon.ps1 b/arionum-miner/src/main/bin/pick-argon.ps1 index 0261769..e526be2 100644 --- a/arionum-miner/src/main/bin/pick-argon.ps1 +++ b/arionum-miner/src/main/bin/pick-argon.ps1 @@ -18,21 +18,18 @@ cd Coreinfo $extensions = .\Coreinfo.exe /accepteula -# $avx512f = select-string -Pattern "AVX512F" -InputObject $extensions +$avx512f = select-string -Pattern "AVX512F" -InputObject $extensions $avx2 = select-string -Pattern "AVX2" -InputObject $extensions $avx = select-string -Pattern "AVX" -InputObject $extensions cd .. -<# if (-not ([string]::IsNullOrEmpty($avx512f))) { echo "Found AVX512F extensions." cp src\main\resources\win32-x86-64\argon2-avx512f.dll argon2.dll } -else -#> -if (-not ([string]::IsNullOrEmpty($avx2))) +elseif (-not ([string]::IsNullOrEmpty($avx2))) { echo "Found AVX2 extensions." cp src\main\resources\win32-x86-64\argon2-avx2.dll argon2.dll diff --git a/arionum-miner/src/main/resources/win32-x86-64/argon2-avx.dll b/arionum-miner/src/main/resources/win32-x86-64/argon2-avx.dll index d643544..b43bff2 100644 Binary files a/arionum-miner/src/main/resources/win32-x86-64/argon2-avx.dll and b/arionum-miner/src/main/resources/win32-x86-64/argon2-avx.dll differ diff --git a/arionum-miner/src/main/resources/win32-x86-64/argon2-avx2.dll b/arionum-miner/src/main/resources/win32-x86-64/argon2-avx2.dll index ae5b992..a21e558 100644 Binary files a/arionum-miner/src/main/resources/win32-x86-64/argon2-avx2.dll and b/arionum-miner/src/main/resources/win32-x86-64/argon2-avx2.dll differ diff --git a/arionum-miner/src/main/resources/win32-x86-64/argon2-avx512f.dll b/arionum-miner/src/main/resources/win32-x86-64/argon2-avx512f.dll new file mode 100644 index 0000000..c986c18 Binary files /dev/null and b/arionum-miner/src/main/resources/win32-x86-64/argon2-avx512f.dll differ diff --git a/arionum-miner/src/main/resources/win32-x86-64/argon2-generic.dll b/arionum-miner/src/main/resources/win32-x86-64/argon2-generic.dll index 3447acc..2aa7a84 100644 Binary files a/arionum-miner/src/main/resources/win32-x86-64/argon2-generic.dll and b/arionum-miner/src/main/resources/win32-x86-64/argon2-generic.dll differ diff --git a/arionum-miner/src/main/resources/win32-x86-64/argon2.dll b/arionum-miner/src/main/resources/win32-x86-64/argon2.dll index 3447acc..2aa7a84 100644 Binary files a/arionum-miner/src/main/resources/win32-x86-64/argon2.dll and b/arionum-miner/src/main/resources/win32-x86-64/argon2.dll differ