Merge pull request #404 from rrhodgson/feature/json_nvcc

Feature/json nvcc
Updated json to latest release 3.10.5
2026-10-22 15:13:19 +01:00 · 2022-05-25 13:30:11 -04:00 · 2022-05-24 16:16:06 +01:00 · 2022-05-24 15:48:01 +01:00 · 2022-05-24 14:37:33 +01:00 · 2022-05-24 14:30:26 +01:00
4 changed files with 13672 additions and 10503 deletions
@@ -26,7 +26,7 @@
    *************************************************************************************/
    /*  END LEGAL */
 #include <Grid/Grid.h>
-#if (!defined(GRID_CUDA)) && (!defined(GRID_HIP))
+#ifndef GRID_HIP

 NAMESPACE_BEGIN(Grid);

@@ -82,7 +82,7 @@ void JSONWriter::writeDefault(const std::string &s,	const std::string &x)
  if (s.size())
    ss_ << "\""<< s << "\" : \"" << os.str() << "\" ," ;
  else
-    ss_ << os.str() << " ," ;
+    ss_ << "\""<< os.str() << "\" ," ;
 }

 // Reader implementation ///////////////////////////////////////////////////////
@@ -54,7 +54,7 @@ namespace Grid
    void pop(void);
    template <typename U>
    void writeDefault(const std::string &s, const U &x);
-#ifdef __NVCC__
+#if defined(GRID_CUDA) || defined(GRID_HIP)
    void writeDefault(const std::string &s, const Grid::ComplexD &x) 
    { 
      std::complex<double> z(real(x),imag(x));
@@ -101,7 +101,7 @@ namespace Grid
    void readDefault(const std::string &s, std::vector<U> &output);
    template <typename U, typename P>
    void readDefault(const std::string &s, std::pair<U,P> &output);
-#ifdef __NVCC__
+#if defined(GRID_CUDA) || defined(GRID_HIP)
    void readDefault(const std::string &s, ComplexD &output)
    { 
      std::complex<double> z;
@@ -36,7 +36,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include "BinaryIO.h"
 #include "TextIO.h"
 #include "XmlIO.h"
-#if (!defined(GRID_CUDA)) && (!defined(GRID_HIP))
+#ifndef GRID_HIP
 #include "JSON_IO.h"
 #endif
Author	SHA1	Message	Date
Peter Boyle	a9c2e1df03	Merge pull request #404 from rrhodgson/feature/json_nvcc Feature/json nvcc	2022-05-25 13:30:11 -04:00
rhodgson	da4daea57a	Updated json to latest release 3.10.5	2022-05-24 16:16:06 +01:00
rhodgson	e346154c5d	Updated json CUDA compile guards	2022-05-24 15:48:01 +01:00
rhodgson	3ca0de1c40	Fix json write for vector<string>	2022-05-24 14:37:33 +01:00
rhodgson	c7205d2a73	Removed nvcc guards for json	2022-05-24 14:30:26 +01:00