Merge branch 'master' into fix-compiler-warnings

libocca · May 30, 2020 · d60edee · d60edee
2 parents e144223 + afc69bf
commit d60edee
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,3 +87,5 @@ if (ENABLE_TESTS)
 endif()
 
 install(DIRECTORY include/ DESTINATION include)
+
+include(Summary)
diff --git a/cmake/CUDA.cmake b/cmake/CUDA.cmake
@@ -16,10 +16,6 @@ if (CUDA_FOUND)
   set(WITH_CUDA 1)
   set(OCCA_CUDA_ENABLED 1)
   include_directories( ${CUDA_INCLUDE_DIRS} )
-
-  message(STATUS "CUDA version:       ${CUDA_VERSION_STRING}")
-  message(STATUS "CUDA Include Paths: ${CUDA_INCLUDE_DIRS}")
-  message(STATUS "CUDA Libraries:     ${CUDA_LIBRARIES}")
 else (CUDA_FOUND)
   set(WITH_CUDA 0)
   set(OCCA_CUDA_ENABLED 0)

diff --git a/cmake/HIP.cmake b/cmake/HIP.cmake
@@ -6,10 +6,6 @@ if (HIP_FOUND)
   add_definitions(-D${HIP_RUNTIME_DEFINE})
   include_directories( ${HIP_INCLUDE_DIRS} )
 
-  message(STATUS "HIP version:       ${HIP_VERSION_STRING}")
-  message(STATUS "HIP platform:      ${HIP_PLATFORM}")
-  message(STATUS "HIP Include Paths: ${HIP_INCLUDE_DIRS}")
-  message(STATUS "HIP Libraries:     ${HIP_LIBRARIES}")
 else (HIP_FOUND)
   set(WITH_HIP 0)
   set(OCCA_HIP_ENABLED 0)

diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
@@ -0,0 +1,63 @@
+message("Configuration summary")
+message("  System:                       ${CMAKE_SYSTEM}")
+message("  CXX compiler:                 ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})")
+message("  CXX FLAGS:                    ${CMAKE_CXX_FLAGS}")
+message("  C compiler:                   ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})")
+message("  C FLAGS:                      ${CMAKE_C_FLAGS}\n")
+
+if (CUDA_FOUND)
+  message("  With CUDA:                    ON")
+  message("    CUDA version:               ${CUDA_VERSION_STRING}")
+  message("    CUDA include dirs:          ${CUDA_INCLUDE_DIRS}")
+  message("    CUDA libraries:             ${CUDA_LIBRARIES}")
+else()
+  message("  With CUDA:                    OFF")
+endif()
+
+if (MPI_FOUND)
+  message("  With MPI:                     ON")
+  message("    MPI version:                ${MPI_CXX_VERSION}")
+  message("    MPI include dirs:           ${MPI_CXX_INCLUDE_DIRS}")
+  message("    MPI libraries:              ${MPI_CXX_LIBRARIES}")
+  message("    MPI link flags:             ${MPI_CXX_LINK_FLAGS}")
+
+else()
+  message("  With MPI:                     OFF")
+endif()
+
+if (OpenMP_FOUND)
+  message("  With OpenMP:                  ON")
+  message("    OpenMP version:             ${OpenMP_CXX_VERSION}")
+  message("    OpenMP flags:               ${OpenMP_CXX_FLAGS}")
+  message("    OpenMP include dirs:        ${OpenMP_CXX_INCLUDE_DIRS}")
+  message("    OpenMP libraries:           ${OpenMP_CXX_LIBRARIES}")
+else()
+  message("  With OpenMP:                  OFF")
+endif()
+
+if (OpenCL_FOUND)
+  message("  With OpenCL:                  ON")
+  message("    OpenCL version:             ${OpenCL_VERSION_STRING}")
+  message("    OpenCL include dirs:        ${OpenCL_INCLUDE_DIRS}")
+  message("    OpenCL libraries:           ${OpenCL_LIBRARIES}")
+else()
+  message("  With OpenCL:                  OFF")
+endif()
+
+if (WITH_METAL)
+  message("  With Metal:                   ON")
+else()
+  message("  With Metal:                   OFF")
+endif()
+
+if (HIP_FOUND)
+  message("  With HIP:                     ON")
+  message("    HIP version:                ${HIP_VERSION_STRING}")
+  message("    HIP platform:               ${HIP_PLATFORM}")
+  message("    HIP include dirs:           ${HIP_INCLUDE_DIRS}")
+  message("    HIP libraries:              ${HIP_LIBRARIES}")
+else()
+  message("  With HIP:                     OFF")
+endif()
+
+message("\n")
diff --git a/include/occa/lang/builtins/attributes/restrict.hpp b/include/occa/lang/builtins/attributes/restrict.hpp
@@ -6,9 +6,9 @@
 namespace occa {
   namespace lang {
     namespace attributes {
-      class restrict : public attribute_t {
+      class occaRestrict : public attribute_t {
       public:
-        restrict();
+        occaRestrict();
 
         virtual const std::string& name() const;
 

diff --git a/include/occa/lang/transforms/builtins/restrict.hpp b/include/occa/lang/transforms/builtins/restrict.hpp
@@ -8,11 +8,11 @@ namespace occa {
     class qualifier_t;
 
     namespace transforms {
-      class restrict : public statementTransform {
+      class occaRestrict : public statementTransform {
       public:
         const qualifier_t &restrictQualifier;
 
-        restrict(const qualifier_t &restrictQualifier_);
+        occaRestrict(const qualifier_t &restrictQualifier_);
 
         virtual statement_t* transformStatement(statement_t &smnt);
       };

diff --git a/src/lang/builtins/attributes/restrict.cpp b/src/lang/builtins/attributes/restrict.cpp
@@ -4,22 +4,22 @@
 namespace occa {
   namespace lang {
     namespace attributes {
-      restrict::restrict() {}
+      occaRestrict::occaRestrict() {}
 
-      const std::string& restrict::name() const {
+      const std::string& occaRestrict::name() const {
         static std::string name_ = "restrict";
         return name_;
       }
 
-      bool restrict::forVariable() const {
+      bool occaRestrict::forVariable() const {
         return true;
       }
 
-      bool restrict::forStatement(const int sType) const {
+      bool occaRestrict::forStatement(const int sType) const {
         return (sType & statementType::declaration);
       }
 
-      bool restrict::isValid(const attributeToken_t &attr) const {
+      bool occaRestrict::isValid(const attributeToken_t &attr) const {
         if (attr.kwargs.size() ||
             attr.args.size()) {
           attr.printError("[@restrict] does not take arguments");

diff --git a/src/lang/parser.cpp b/src/lang/parser.cpp
@@ -60,7 +60,7 @@ namespace occa {
       addAttribute<attributes::dim>();
       addAttribute<attributes::dimOrder>();
       addAttribute<attributes::tile>();
-      addAttribute<attributes::restrict>();
+      addAttribute<attributes::occaRestrict>();
       addAttribute<attributes::implicitArg>();
       addAttribute<attributes::globalPtr>();
     }

diff --git a/src/lang/specialMacros.cpp b/src/lang/specialMacros.cpp
@@ -47,7 +47,6 @@ namespace occa {
         token->origin
           .from(false, thisToken.origin)
           .printError("Expected a token name identifier");
-        throw;
 
         freeTokenVector(args);
         return;

diff --git a/src/lang/transforms/builtins/restrict.cpp b/src/lang/transforms/builtins/restrict.cpp
@@ -7,13 +7,13 @@
 namespace occa {
   namespace lang {
     namespace transforms {
-      restrict::restrict(const qualifier_t &restrictQualifier_) :
+      occaRestrict::occaRestrict(const qualifier_t &restrictQualifier_) :
         restrictQualifier(restrictQualifier_) {
         validStatementTypes = (statementType::functionDecl |
                                statementType::function);
       }
 
-      statement_t* restrict::transformStatement(statement_t &smnt) {
+      statement_t* occaRestrict::transformStatement(statement_t &smnt) {
         function_t &func = (
           (smnt.type() & statementType::function)
           ? smnt.to<functionStatement>().function
@@ -46,7 +46,7 @@ namespace occa {
 
       bool applyRestrictTransforms(statement_t &smnt,
                                    const qualifier_t &restrictQualifier) {
-        restrict restrictTransform(restrictQualifier);
+        occaRestrict restrictTransform(restrictQualifier);
         return restrictTransform.statementTransform::apply(smnt);
       }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -87,3 +87,5 @@ if (ENABLE_TESTS)
		endif()

		install(DIRECTORY include/ DESTINATION include)

		include(Summary)