Merge xmrig-cuda v6.15.1 into master

MoneroOcean · Sep 19, 2021 · 0a5ebf5 · 0a5ebf5
2 parents 97153e8 + 7d34e20
commit 0a5ebf5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v6.15.1
+- [#119](https://github.com/xmrig/xmrig-cuda/issues/119) Fixed compile error on Linux.
+- [#124](https://github.com/xmrig/xmrig-cuda/pull/124) Fixed `"out of memory"` error on non-CryptoNight algorithms.
+- [#125](https://github.com/xmrig/xmrig-cuda/pull/125) Fixed `"invalid argument"` error.
+
 # v6.15.0
 - **ABI changed, minimum supported XMRig version now is 6.15.0.**
 - [#2563](https://github.com/xmrig/xmrig/pull/2563) Added new algorithm RandomX Graft (`rx/graft`).

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Main reasons why this plugin is separated project is:
 
 ## Windows usage
 
-* [Download](https://github.com/xmrig/xmrig-cuda/releases) plugin, you must choose CUDA version, usually it recent version (CUDA 10.1), but builds with older CUDA version also provided, alternative you can build the plugin from source.
+* [Download](https://github.com/xmrig/xmrig-cuda/releases) plugin, you must choose CUDA version, usually it recent version (CUDA 10.1), but builds with older CUDA version also provided, alternative you can build the plugin from source (requiring GCC 9).
 * Place **`xmrig-cuda.dll`** and other dll files near to **`xmrig.exe`**.
 * Edit **`config.json`** to enable CUDA support.
 ```

diff --git a/src/crypto/common/Algorithm.h b/src/crypto/common/Algorithm.h
@@ -21,6 +21,7 @@
 #define XMRIG_ALGORITHM_H
 
 
+#include <cstdint>
 #include <vector>
 
 

diff --git a/src/cuda_extra.cu b/src/cuda_extra.cu
@@ -421,7 +421,7 @@ int cryptonight_extra_cpu_init(nvid_ctx *ctx, const xmrig_cuda::Algorithm &algor
     CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_result_nonce, 16 * sizeof (uint32_t)));
 
     // Allocate buffers for Cryptonight
-    if (hashMemSize) {
+    if (hashMemSize && algorithm.isCN()) {
         CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_ctx_key1, 40 * sizeof(uint32_t) * wsize));
         CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_ctx_key2, 40 * sizeof(uint32_t) * wsize));
         CUDA_CHECK(ctx->device_id, cudaMalloc(&ctx->d_ctx_text, 32 * sizeof(uint32_t) * wsize));

diff --git a/src/version.h b/src/version.h
@@ -22,14 +22,14 @@
 #define APP_ID        "xmrig-cuda"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig CUDA plugin"
-#define APP_VERSION   "6.15.0-mo1"
+#define APP_VERSION   "6.15.1-mo1"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com"
 
 #define APP_VER_MAJOR  6
 #define APP_VER_MINOR  15
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1
 
 #define API_VERSION    4
 

diff --git a/src/xmrig-cuda.cpp b/src/xmrig-cuda.cpp
@@ -68,6 +68,7 @@ class DatasetHost
         if (m_refs == 0) {
             cudaHostUnregister(m_ptr);
         }
+        m_ptr = nullptr;
     }
 
     int32_t m_refs  = 0;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,7 @@
		#define XMRIG_ALGORITHM_H


		#include <cstdint>
		#include <vector>


Expand Down