Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v6.21.0
+- [#167](https://github.com/xmrig/xmrig-cuda/pull/167) Removed deprecated AstroBWTv1 and v2.
+- [#176](https://github.com/xmrig/xmrig-cuda/pull/176) Added CUDA 12 support.
+- [#191](https://github.com/xmrig/xmrig-cuda/pull/191) Fixed Zephyr mining.
+
 # v6.17.0
 - [#157](https://github.com/xmrig/xmrig-cuda/pull/157) Added Dero HE (`astrobwt/v2`) support.
 

CMakeLists.txt

@@ -14,13 +14,11 @@ option(WITH_CN_FEMTO   "Enable CryptoNight-UPX2 algorithm" ON)
 option(WITH_ARGON2     "Enable Argon2 algorithms family" OFF) #unsupported
 
 if (CUDA_VERSION VERSION_LESS 9.0)
-    message(STATUS "CUDA ${CUDA_VERSION}: RandomX, AstroBWT, and KawPow disabled, they do not work with old CUDA")
+    message(STATUS "CUDA ${CUDA_VERSION}: RandomX and KawPow disabled, they do not work with old CUDA")
     option(WITH_RANDOMX  "Enable RandomX algorithms family" OFF)
-    option(WITH_ASTROBWT "Enable AstroBWT algorithms family" OFF)
     option(WITH_KAWPOW   "Enable KawPow algorithms family" OFF)
 else()
     option(WITH_RANDOMX  "Enable RandomX algorithms family" ON)
-    option(WITH_ASTROBWT "Enable AstroBWT algorithms family" ON)
     option(WITH_KAWPOW   "Enable KawPow algorithms family" ON)
 endif()
 
@@ -48,10 +46,6 @@ if (WITH_ARGON2)
     add_definitions(/DXMRIG_ALGO_ARGON2)
 endif()
 
-if (WITH_ASTROBWT)
-    add_definitions(/DXMRIG_ALGO_ASTROBWT)
-endif()
-
 if (WITH_KAWPOW)
     if (WITH_DRIVER_API)
         add_definitions(/DXMRIG_ALGO_KAWPOW)

cmake/CUDA.cmake

@@ -24,7 +24,7 @@ endif()
 # Kepler GPUs are only supported with CUDA < 11.0
 if (CUDA_VERSION VERSION_LESS 11.0)
     list(APPEND DEFAULT_CUDA_ARCH "30")
-else()
+elseif (CUDA_VERSION VERSION_LESS 12.0)
     list(APPEND DEFAULT_CUDA_ARCH "35")
 endif()
 
@@ -47,6 +47,18 @@ endif()
 if (NOT CUDA_VERSION VERSION_LESS 11.0)
     list(APPEND DEFAULT_CUDA_ARCH "80")
 endif()
+
+if (NOT CUDA_VERSION VERSION_LESS 11.1)
+    list(APPEND DEFAULT_CUDA_ARCH "86")
+endif()
+
+if (NOT CUDA_VERSION VERSION_LESS 11.5)
+    list(APPEND DEFAULT_CUDA_ARCH "87")
+endif()
+
+if (NOT CUDA_VERSION VERSION_LESS 11.8)
+    list(APPEND DEFAULT_CUDA_ARCH "90")
+endif()
 list(SORT DEFAULT_CUDA_ARCH)
 
 set(CUDA_ARCH "${DEFAULT_CUDA_ARCH}" CACHE STRING "Set GPU architecture (semicolon separated list, e.g. '-DCUDA_ARCH=20;35;60')")
@@ -225,21 +237,6 @@ else()
     set(CUDA_RANDOMX_SOURCES "")
 endif()
 
-if (WITH_ASTROBWT)
-    set(CUDA_ASTROBWT_SOURCES
-        src/AstroBWT/dero/AstroBWT.cu
-        src/AstroBWT/dero/BWT.h
-        src/AstroBWT/dero/salsa20.h
-        src/AstroBWT/dero/sha3.h
-        src/AstroBWT/dero_he/AstroBWT_v2.cu
-        src/AstroBWT/dero_he/BWT.h
-        src/AstroBWT/dero_he/salsa20.h
-        src/AstroBWT/dero_he/sha3.h
-    )
-else()
-    set(CUDA_ASTROBWT_SOURCES "")
-endif()
-
 if (WITH_KAWPOW AND WITH_DRIVER_API)
     set(CUDA_KAWPOW_SOURCES
         src/KawPow/raven/CudaKawPow_gen.cpp
@@ -264,7 +261,6 @@ set(CUDA_SOURCES
     src/cuda_keccak.hpp
     src/cuda_skein.hpp
     ${CUDA_RANDOMX_SOURCES}
-    ${CUDA_ASTROBWT_SOURCES}
     ${CUDA_KAWPOW_SOURCES}
 )