2.14.5

CHANGELOG.md

@@ -1,3 +1,17 @@
+# v2.14.4
+- [#260](https://github.com/xmrig/xmrig-nvidia/issues/260) Fixed `cn/r` algorithm slowdown with CUDA 10.1+.
+- [#268](https://github.com/xmrig/xmrig-nvidia/pull/268) Added support for NVIDIA Jetson.
+- In HTTP API for unknown hashrate now used `null` instead of `0.0`.
+- Fixed MSVC 2019 version detection.
+- Removed obsolete automatic variants.
+
+# v2.14.3
+- [#260](https://github.com/xmrig/xmrig-nvidia/issues/260) Added workaround for CUDA bug, thanks [@psychocrypt](https://github.com/psychocrypt).
+
+# v2.14.2
+- [#253](https://github.com/xmrig/xmrig-nvidia/pull/253) Fixed NVRTC dll copy when build miner.
+- [#255](https://github.com/xmrig/xmrig-nvidia/pull/255) Fixed CUDA8 support and added memory size display in summary.
+
 # v2.14.1
 - [#246](https://github.com/xmrig/xmrig-nvidia/issues/246) Fixed compatibility with old GPUs (compute capability < 3.5).
 

CMakeLists.txt

@@ -128,7 +128,6 @@ set(SOURCES
     src/common/config/ConfigLoader.cpp
     src/common/config/ConfigWatcher.cpp
     src/common/Console.cpp
-    src/common/cpu/BasicCpuInfo.cpp
     src/common/cpu/Cpu.cpp
     src/common/crypto/Algorithm.cpp
     src/common/crypto/keccak.cpp
@@ -158,6 +157,13 @@ set(SOURCES
     src/xmrig.cpp
    )
 
+if (XMRIG_ARM)
+    set(SOURCES ${SOURCES} src/common/cpu/BasicCpuInfo_arm.cpp)
+else()
+    set(SOURCES ${SOURCES} src/common/cpu/BasicCpuInfo.cpp)
+endif()
+
+
 set(SOURCES_CRYPTO
     src/crypto/c_groestl.c
     src/crypto/c_blake256.c
@@ -166,7 +172,7 @@ set(SOURCES_CRYPTO
     src/crypto/CryptoNight.cpp
    )
 
-if (WITH_ASM)
+if (WITH_ASM AND NOT XMRIG_ARM)
     set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/asm/CryptonightR_template.h)
     set(SOURCES_CRYPTO "${SOURCES_CRYPTO}" src/crypto/CryptonightR_gen.cpp)
 endif()
@@ -295,9 +301,9 @@ target_link_libraries(${CMAKE_PROJECT_NAME} xmrig-cuda ${XMRIG_ASM_LIBRARY} ${OP
 if (WIN32)
     file(GLOB NVRTCDLL "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvrtc64*.dll")
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NVRTCDLL}" $<TARGET_FILE_DIR:xmrig-nvidia>)
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NVRTCDLL}" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
 
     file(GLOB NVRTCBUILTINDLL "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvrtc-builtins64*.dll")
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NVRTCBUILTINDLL}" $<TARGET_FILE_DIR:xmrig-nvidia>)
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NVRTCBUILTINDLL}" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)
 endif()

cmake/flags.cmake

@@ -12,10 +12,19 @@ set(CMAKE_CXX_STANDARD 11)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    if (XMRIG_ARM)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+    else()
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    endif()
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-strict-aliasing")
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -maes -Wall")
+    if (XMRIG_ARM)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -flax-vector-conversions")
+    else()
+	 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -maes -Wall")
+    endif()
+
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s -Wno-sign-compare")
 
     if (WIN32)
@@ -38,9 +47,18 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 
 elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    if (XMRIG_ARM)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+    else()
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
+    endif()
+
+    if (XMRIG_ARM)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti")
+    else()
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
+    endif()
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 
 endif()

src/api/ApiRouter.cpp

@@ -53,13 +53,15 @@
 #include "workers/Workers.h"
 
 
-static inline double normalize(double d)
+static inline rapidjson::Value normalize(double d)
 {
+    using namespace rapidjson;
+
     if (!isnormal(d)) {
-        return 0.0;
+        return Value(kNullType);
     }
 
-    return floor(d * 100.0) / 100.0;
+    return Value(floor(d * 100.0) / 100.0);
 }
 
 

src/common/net/Job.cpp

@@ -127,24 +127,6 @@ bool xmrig::Job::setBlob(const char *blob)
         m_algorithm.setVariant(variant());
     }
 
-    if (!m_algorithm.isForced()) {
-        if (m_algorithm.variant() == VARIANT_XTL && m_blob[0] >= 9) {
-            m_algorithm.setVariant(VARIANT_HALF);
-        }
-        else if (m_algorithm.variant() == VARIANT_MSR && m_blob[0] >= 8) {
-            m_algorithm.setVariant(VARIANT_HALF);
-        }
-        else if (m_algorithm.variant() == VARIANT_WOW && m_blob[0] < 11) {
-            m_algorithm.setVariant(VARIANT_2);
-        }
-        else if (m_algorithm.variant() == VARIANT_RWZ && m_blob[0] < 12) {
-            m_algorithm.setVariant(VARIANT_2);
-        }
-        else if (m_algorithm.variant() == VARIANT_ZLS && m_blob[0] < 8) {
-            m_algorithm.setVariant(VARIANT_2);
-        }
-    }
-
 #   ifdef XMRIG_PROXY_PROJECT
     memset(m_rawBlob, 0, sizeof(m_rawBlob));
     memcpy(m_rawBlob, blob, m_size * 2);

src/crypto/CryptoNight.cpp

@@ -34,9 +34,14 @@
 #include "Mem.h"
 #include "crypto/CryptoNight.h"
 #include "crypto/CryptoNight_test.h"
-#include "crypto/CryptoNight_x86.h"
 #include "net/JobResult.h"
 
+#ifdef XMRIG_ARM
+    #include "crypto/CryptoNight_arm.h"
+#else
+    #include "crypto/CryptoNight_x86.h"
+#endif
+
 
 alignas(16) cryptonight_ctx *CryptoNight::m_ctx = nullptr;
 xmrig::Algo CryptoNight::m_algorithm = xmrig::CRYPTONIGHT;