Merge pull request #477 from XpressAI/eg_cpp17

Switch default to GNU-C++17
XpressAI · Feb 4, 2022 · 40c522b · 40c522b
2 parents 3907785 + 85a2647
commit 40c522b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/resources/com/nec/cyclone/cpp/Makefile b/src/main/resources/com/nec/cyclone/cpp/Makefile
@@ -1,5 +1,5 @@
 CPP = $(shell ls /opt/nec/ve/bin/nc++ 2>/dev/null || echo c++)
-CPP_OPTS = -std=c++17 \
+CPP_OPTS = -std=gnu++17 \
 	-O4 \
 	-fno-defer-inline-template-instantiation \
 	-finline-functions \

diff --git a/src/main/scala/com/nec/ve/VeKernelCompiler.scala b/src/main/scala/com/nec/ve/VeKernelCompiler.scala
@@ -65,7 +65,7 @@ object VeKernelCompiler {
   }
 
   final case class VeCompilerConfig(
-    nccPath: String = "/opt/nec/ve/bin/ncc",
+    nccPath: String = "/opt/nec/ve/bin/nc++",
     optimizationLevel: Int = 4,
     doDebug: Boolean = false,
     maybeProfileTarget: Option[ProfileTarget] = None,
@@ -76,6 +76,7 @@ object VeKernelCompiler {
       // Optimizations used in frovedis: -fno-defer-inline-template-instantiation -finline-functions -finline-max-depth = 10 -msched-block
       val ret = List(
         s"-O$optimizationLevel",
+        "-std=gnu++17",
         "-fpic",
         "-fno-defer-inline-template-instantiation",
         "-finline-functions",