added a patch

3 files changed, 53 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c292dff89567..0fc9c4d09345 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mxnet
 	pkgdesc = Flexible and Efficient Library for Deep Learning
 	pkgver = 1.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://mxnet.io/
 	arch = x86_64
 	license = Apache
@@ -32,7 +32,9 @@ pkgbase = mxnet
 	optdepends = vtk
 	optdepends = glew
 	source = git+https://github.com/apache/incubator-mxnet#tag=1.3.0
+	source = cuda_call.patch
 	md5sums = SKIP
+	md5sums = 77a777e6971e568177e0ea3aeecb401c
 
 pkgname = mxnet
 
diff --git a/PKGBUILD b/PKGBUILD
index 8619fcfd3adc..12c77b2aa438 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=mxnet
 _gitname=incubator-mxnet
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Flexible and Efficient Library for Deep Learning"
 arch=('x86_64')
 url="http://mxnet.io/"
@@ -11,8 +11,9 @@ license=('Apache')
 depends=('hdf5' 'cblas' 'lapack' 'python-numpy' 'python-requests' 'intel-tbb')
 optdepends=('cairo' 'cuda' 'cudnn' 'gtk3' 'gtkglext' 'python-graphviz' 'opencv' 'vtk' 'glew')
 makedepends=(${optdepends[@]} 'git' 'cython')
-source=("git+https://github.com/apache/$_gitname#tag=$pkgver")
-md5sums=('SKIP')
+source=("git+https://github.com/apache/$_gitname#tag=$pkgver"
+	"cuda_call.patch")
+md5sums=('SKIP' '77a777e6971e568177e0ea3aeecb401c')
 
 prepare() {
 	cd "$srcdir/$_gitname"
@@ -53,6 +54,9 @@ prepare() {
 		-e 's|mxnet/%s/.%s|mxnet_%s_%s|' \
 		-e 's|../3rdparty/nnvm/include|../3rdparty/tvm/nnvm/include|' \
 		-i python/setup.py
+	
+	# https://github.com/apache/incubator-mxnet/pull/12374
+	patch -p1 < ${srcdir}/cuda_call.patch
 }
 
 build() {
diff --git a/cuda_call.patch b/cuda_call.patch
new file mode 100644
index 000000000000..7f1dae135808
--- /dev/null
+++ b/cuda_call.patch
@@ -0,0 +1,43 @@
+diff --git a/src/common/random_generator.cu b/src/common/random_generator.cu
+index 930e5e07b..e116b8c5f 100644
+--- a/src/common/random_generator.cu
++++ b/src/common/random_generator.cu
+@@ -59,6 +59,17 @@ void RandGenerator<gpu, float>::Seed(mshadow::Stream<gpu> *s, uint32_t seed) {
+   s->Wait();
+ }
+ 
++template<>
++void RandGenerator<gpu, float>::AllocState(RandGenerator<gpu> *inst) {
++  CUDA_CALL(cudaMalloc(&inst->states_,
++                       kNumRandomStates * sizeof(curandStatePhilox4_32_10_t)));
++}
++
++template<>
++void RandGenerator<gpu, float>::FreeState(RandGenerator<gpu> *inst) {
++  CUDA_CALL(cudaFree(inst->states_));
++}
++
+ }  // namespace random
+ }  // namespace common
+ }  // namespace mxnet
+diff --git a/src/common/random_generator.h b/src/common/random_generator.h
+index 5d78b616e..1c8ae01de 100644
+--- a/src/common/random_generator.h
++++ b/src/common/random_generator.h
+@@ -150,14 +150,9 @@ class RandGenerator<gpu, DType> {
+     curandStatePhilox4_32_10_t state_;
+   };  // class RandGenerator<gpu, DType>::Impl
+ 
+-  static void AllocState(RandGenerator<gpu, DType> *inst) {
+-    CUDA_CALL(cudaMalloc(&inst->states_,
+-                         kNumRandomStates * sizeof(curandStatePhilox4_32_10_t)));
+-  }
++  static void AllocState(RandGenerator<gpu, DType> *inst);
+ 
+-  static void FreeState(RandGenerator<gpu, DType> *inst) {
+-    CUDA_CALL(cudaFree(inst->states_));
+-  }
++  static void FreeState(RandGenerator<gpu, DType> *inst);
+ 
+   void Seed(mshadow::Stream<gpu> *s, uint32_t seed);
+