compile on gcc

clab · Nov 29, 2023 · e33eaa6 · e33eaa6
1 parent 22b4495
commit e33eaa6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,7 @@ endif()
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W1 /MP")   # -Wall produces 20k warnings. Enable parallel compilation
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-finite-math-only -Wall -Wno-missing-braces -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-finite-math-only -Wall -Wno-missing-braces -std=c++20")
 
   if (NOT RELEASE_OPT_LEVEL)
     set(RELEASE_OPT_LEVEL "fast")
@@ -181,6 +181,7 @@ if (WITH_CUDA_BACKEND)
   endif()
 endif()
 
+set(EIGEN3_INCLUDE_DIR /usr/local/include/eigen3/)
 # look for Eigen
 if (DEFINED ENV{EIGEN3_INCLUDE_DIR} AND NOT DEFINED EIGEN3_INCLUDE_DIR) # use env variable if not set
   set(EIGEN3_INCLUDE_DIR $ENV{EIGEN3_INCLUDE_DIR})

diff --git a/dynet/exec.cc b/dynet/exec.cc
@@ -7,7 +7,7 @@
 #include "dynet/globals.h"
 #include "dynet/timing.h"
 #include "dynet/devices.h"
-
+#include <cassert>
 #ifdef HAVE_CUDA
 #include "dynet/gpu-ops.h"
 #endif

diff --git a/dynet/nodes-softmaxes.cc b/dynet/nodes-softmaxes.cc
@@ -3,7 +3,7 @@
 
 #include "dynet/nodes-impl-macros.h"
 #include "dynet/functors.h"
-
+#include <cassert>
 using namespace std;
 
 namespace dynet {

diff --git a/dynet/simd-functors.h b/dynet/simd-functors.h
@@ -70,6 +70,11 @@ struct functor_traits<dynet::const_minus_op<Scalar> > {
 };
 } }
 
+#define EIGEN_EMPTY_STRUCT_CTOR(X)		 \
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE X() {}			\
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE X(const X& ) {}
+
+
 namespace dynet {
 template<typename Scalar> struct scalar_logistic_sigmoid_op {
   EIGEN_EMPTY_STRUCT_CTOR(scalar_logistic_sigmoid_op)