symmetrize() is applied to CUDA solvers.

shinmorino · Jun 24, 2018 · 500f95c · 500f95c
1 parent 81befec
commit 500f95c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/sqaodc/cuda/CUDADenseGraphAnnealer.cu b/sqaodc/cuda/CUDADenseGraphAnnealer.cu
@@ -130,11 +130,13 @@ void CUDADenseGraphAnnealer<real>::setQUBO(const HostMatrix &W, sq::OptimizeMeth
     om_ = om;
 
     DeviceMatrix *dW = devStream_->tempDeviceMatrix<real>(W.dim(), __func__);
+    DeviceMatrix *dWsym = devStream_->tempDeviceMatrix<real>(W.dim(), __func__);
     devCopy_(dW, W);
     devCopy_.clearPadding(dW);
+    devFormulas_.devMath.symmetrize(dWsym, *dW);
     if (om == sq::optMaximize)
-        devFormulas_.devMath.scale(dW, -1., *dW);
-    devFormulas_.calculateHamiltonian(&d_h_, &d_J_, &d_c_, *dW);
+        devFormulas_.devMath.scale(dWsym, -1., *dWsym);
+    devFormulas_.calculateHamiltonian(&d_h_, &d_J_, &d_c_, *dWsym);
     devStream_->synchronize();
 
     setState(solProblemSet);

diff --git a/sqaodc/cuda/CUDADenseGraphBFSearcher.cpp b/sqaodc/cuda/CUDADenseGraphBFSearcher.cpp
@@ -1,12 +1,14 @@
 #include "CUDADenseGraphBFSearcher.h"
 #include <sqaodc/common/internal/ShapeChecker.h>
+#include <sqaodc/cpu/SharedFormulas.h>
 #include "Device.h"
 #include <cmath>
 #include <float.h>
 #include <algorithm>
 #include <limits>
 
 namespace sqint = sqaod_internal;
+namespace sqcpu = sqaod_cpu;
 using namespace sqaod_cuda;
 
 template<class real>
@@ -54,7 +56,7 @@ void CUDADenseGraphBFSearcher<real>::setQUBO(const Matrix &W, sq::OptimizeMethod
     throwErrorIf(63 < W.rows, "N must be smaller than 64, N=%d.", W.rows);
 
     N_ = W.rows;
-    W_ = W;
+    W_ = sqcpu::symmetrize(W);
     om_ = om;
     if (om_ == sq::optMaximize)
         W_ *= real(-1.);