fixes for centos 7

AlexeySmolenchuk · Jan 3, 2020 · b829d0c · b829d0c
1 parent ba61388
commit b829d0c
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,6 +21,8 @@ endif (POLICY CMP0048)
 project(optix7course)
 
 cmake_minimum_required(VERSION 2.8)
+set (CMAKE_CXX_FLAGS "--std=c++11")
+set (CUDA_PROPAGATE_HOST_FLAGS ON)
 
 # ------------------------------------------------------------------
 # first, include gdt project to do some general configuration stuff

diff --git a/README.md b/README.md
@@ -2,6 +2,9 @@
 
 ## Latest Updates:
 
+* 1/3/2020: Several fixes and documentation adds to make project
+  compile with CentOS 7 (ie, oder gcc)
+
 * 1/1/2020: Changed all examples to enable full optimization level
    and most appropriate pipeline config for the specific example (single GAS)
 
@@ -71,8 +74,14 @@ Detailed steps below:
 ## Building under Linux
 
 - Install required packages
+
+    - on Debian/Ubuntu:
 ```
     sudo apt install libglfw3-dev cmake-curses-gui
+```
+    - on RedHat/CentOS/Fedoral (tested CentOS 7.7):
+```
+    sudo yum install cmake3 glfw-devel freeglut-devel
 ```
 - Clone the code
 ```
@@ -87,8 +96,13 @@ Detailed steps below:
 ```
 
 - configure with cmake
+    - Ubuntu:
+```
+    cmake ..
+```
+    - CentOS 7:
 ```
-    ccmake ..
+    cmake3 ..
 ```
 
 - and build

diff --git a/common/gdt/gdt/gdt.h b/common/gdt/gdt/gdt.h
@@ -30,8 +30,10 @@
 #endif
 #include <algorithm>
 #ifdef __GNUC__
-    #include <sys/time.h>
+#  include <sys/time.h>
+#  include <stdint.h>
 #endif
+#include <stdexcept>
 
 #ifdef _WIN32
     #ifndef WIN32_LEAN_AND_MEAN
@@ -154,11 +156,15 @@ namespace gdt {
 #endif
 
 // #ifdef __CUDA_ARCH__
-  using ::sqrt;
-  using ::sqrtf;
+  // using ::sqrt;
+  // using ::sqrtf;
 // #else
-//   inline __both__ float sqrt(const float f)   { return sqrtf(f); }
-//   inline __both__ double sqrt(const double d)   { return sqrt(d); }
+  namespace overloaded {
+    /* move all those in a special namespace so they will never get
+       included - and thus, conflict with, the default namesapce */
+    inline __both__ float  sqrt(const float f)   { return ::sqrtf(f); }
+    inline __both__ double sqrt(const double d)   { return ::sqrt(d); }
+  }
 // #endif
 //   inline __both__ float rsqrt(const float f)   { return 1.f/sqrtf(f); }
 //   inline __both__ double rsqrt(const double d)   { return 1./sqrt(d); }

diff --git a/common/gdt/gdt/math/vec.h b/common/gdt/gdt/math/vec.h
@@ -305,14 +305,14 @@ namespace gdt {
   template<typename T>
   inline __both__ vec_t<T,3> normalize(const vec_t<T,3> &v)
   {
-    return v * 1.f/gdt::sqrt(dot(v,v));
+    return v * 1.f/gdt::overloaded::sqrt(dot(v,v));
   }
 
   /*! vector cross product */
   template<typename T>
   inline __both__ T length(const vec_t<T,3> &v)
   {
-    return gdt::sqrt(dot(v,v));
+    return gdt::overloaded::sqrt(dot(v,v));
   }
 
   template<typename T>

diff --git a/example02_pipelineAndRayGen/optix7.h b/example02_pipelineAndRayGen/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example03_inGLFWindow/optix7.h b/example03_inGLFWindow/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example04_firstTriangleMesh/optix7.h b/example04_firstTriangleMesh/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example05_firstSBTData/optix7.h b/example05_firstSBTData/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example06_multipleObjects/optix7.h b/example06_multipleObjects/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example07_firstRealModel/optix7.h b/example07_firstRealModel/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example08_addingTextures/optix7.h b/example08_addingTextures/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example09_shadowRays/optix7.h b/example09_shadowRays/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example10_softShadows/optix7.h b/example10_softShadows/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example11_denoiseColorOnly/optix7.h b/example11_denoiseColorOnly/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\

diff --git a/example12_denoiseSeparateChannels/optix7.h b/example12_denoiseSeparateChannels/optix7.h
@@ -21,6 +21,7 @@
 #include <optix.h>
 #include <optix_stubs.h>
 #include <sstream>
+#include <stdexcept>
 
 #define CUDA_CHECK(call)							\
     {									\