Merge pull request #338 from LLNL/release/0.4.0

Release version 0.4.0

.gitignore

@@ -1,4 +1,7 @@
 *.pyc
 *.o
+*.a
 *.exe
+*.gch
 build/
+build-*/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "blt"]
+	path = blt
+	url = https://github.com/LLNL/blt.git

.travis.yml

@@ -13,60 +13,64 @@ matrix:
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-4.9, libtbb-dev ] } }
     env:
     - COMPILER=g++-4.9
-    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_WARNINGS=On"
+    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On"
   - compiler: gcc-6
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-6, libtbb-dev ] } }
     env:
     - COMPILER=g++-6
-    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_WARNINGS=On"
+    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On"
   - compiler: gcc-7
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-7, libtbb-dev ] } }
     env:
     - COMPILER=g++-7
-    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_WARNINGS=On"
+    - CMAKE_EXTRA_FLAGS="-DENABLE_WARNINGS=On -DENABLE_TBB=On"
   - compiler: clang-5
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-6, libtbb-dev ] } }
     env:
     - COMPILER=clang++-5.0.0
     - LLVM_VERSION=5.0.0
     - DOWNLOAD_URL=http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_CXX_FLAGS=-fmodules -DENABLE_TBB=On"
   - compiler: clang-3.9
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-6, libtbb-dev ] } }
     env:
     - COMPILER=clang++-3.9.1
     - LLVM_VERSION=3.9.1
+    - CMAKE_EXTRA_FLAGS="-DENABLE_TBB=On"
   - compiler: clang-4.0
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-6, libtbb-dev ] } }
     env:
     - COMPILER=clang++-4.0.0
     - LLVM_VERSION=4.0.0
+    - CMAKE_EXTRA_FLAGS="-DENABLE_TBB=On"
   - compiler: intel-17
     env:
     - COMPILER=icpc
     - TRAVIS_INSTALL_COMPILER="intel"
+    - CMAKE_EXTRA_FLAGS="-DENABLE_TBB=On"
   - compiler: nvcc
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-4.9, libtbb-dev ] } }
     env:
     - COMPILER=g++-4.9
-    - CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_CUDA=On"
+    - CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=On -DENABLE_TBB=On"
     - TRAVIS_INSTALL_COMPILER="nvcc"
     - DO_TEST=no
   - compiler: gcc-4.9-debug
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-4.9, libtbb-dev ] } }
     env:
     - COMPILER=g++-4.9
-    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug  -DRAJA_ENABLE_COVERAGE=On"
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug  -DENABLE_COVERAGE=On -DENABLE_TBB=On"
   - compiler: clang-3.9-debug
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-6, libtbb-dev ] } }
     env:
     - COMPILER=clang++
     - LLVM_VERSION=3.9.1
-    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug"
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_TBB=On"
   - compiler: nvcc-debug
     addons: { apt: { sources: [ ubuntu-toolchain-r-test ] , packages: [ g++-4.9, libtbb-dev ] } }
     env:
     - COMPILER=g++-4.9
-    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_CUDA=On"
+    - CMAKE_EXTRA_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_CUDA=On -DENABLE_TBB=On"
     - TRAVIS_INSTALL_COMPILER="nvcc"
     - DO_TEST=no
 cache:
@@ -97,5 +101,5 @@ before_install:
 script:
 - ./scripts/travis_build_and_test.sh
 after_success:
-- if [[ "${CMAKE_EXTRA_FLAGS}" == *"RAJA_ENABLE_COVERAGE"* ]] ; then bash <(curl -s https://codecov.io/bash) -a "-f"; fi
+- if [[ "${CMAKE_EXTRA_FLAGS}" == *"ENABLE_COVERAGE"* ]] ; then bash <(curl -s https://codecov.io/bash) -a "-f" >& /dev/null; fi
 - if [[ "${TRAVIS_INSTALL_COMPILER}" == "intel" ]] ; then uninstall_intel_software ; fi

CMakeLists.txt

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2016, Lawrence Livermore National Security, LLC.
+# Copyright (c) 2016-17, Lawrence Livermore National Security, LLC.
 #
 # Produced at the Lawrence Livermore National Laboratory
 #
@@ -9,34 +9,7 @@
 #
 # This file is part of RAJA.
 #
-# For additional details, please also read RAJA/LICENSE.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the disclaimer below.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the disclaimer (as noted below) in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of the LLNS/LLNL nor the names of its contributors may
-#   be used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY,
-# LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# For details about use and distribution, please read RAJA/LICENSE.
 #
 ###############################################################################
 
@@ -47,30 +20,44 @@ project(RAJA LANGUAGES CXX C)
 
 # Set version number
 set(RAJA_VERSION_MAJOR 0)
-set(RAJA_VERSION_MINOR 3)
-set(RAJA_VERSION_PATCHLEVEL 1)
+set(RAJA_VERSION_MINOR 4)
+set(RAJA_VERSION_PATCHLEVEL 0)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/thirdparty" ${CMAKE_MODULE_PATH})
 
 # Build options
+set(ENABLE_OPENMP On CACHE Bool "Build OpenMP support")
+set(ENABLE_CUDA Off CACHE Bool "Build CUDA support")
+set(ENABLE_COPY_HEADERS Off CACHE Bool "")
+set(ENABLE_WARNINGS_AS_ERRORS Off CACHE Bool "")
+
 set(RAJA_CXX_STANDARD_FLAG "default" CACHE STRING "Specific c++ standard flag to use, default attempts to autodetect the highest available")
-option(RAJA_ENABLE_OPENMP "Build OpenMP support" On)
-option(RAJA_ENABLE_TBB "Build TBB support" On)
-option(RAJA_ENABLE_TARGET_OPENMP "Build OpenMP on target device support" Off)
-option(RAJA_ENABLE_CUDA "Build CUDA support" Off)
-option(RAJA_ENABLE_CLANG_CUDA "Use Clang's native CUDA support" Off)
-set(RAJA_CUDA_ARCH "sm_35" CACHE STRING "Compute architecture to pass to CUDA builds")
-option(RAJA_ENABLE_CUB "Use cub for scans using CUDA" On)
-option(RAJA_ENABLE_TESTS "Build tests" On)
-option(RAJA_ENABLE_EXAMPLES "Build simple examples" On)
-option(RAJA_ENABLE_NESTED "Enable nested loop support" Off)
-option(RAJA_ENABLE_WARNINGS "Enable warnings as errors for CI" Off)
-option(RAJA_ENABLE_DOCUMENTATION "Build RAJA documentation" Off)
-
-option(RAJA_ENABLE_COVERAGE "Enable coverage (only supported with GCC)" Off)
+
+option(ENABLE_TBB "Build TBB support" Off)
+option(ENABLE_TARGET_OPENMP "Build OpenMP on target device support" Off)
+option(ENABLE_CLANG_CUDA "Use Clang's native CUDA support" Off)
+set(CUDA_ARCH "sm_35" CACHE STRING "Compute architecture to pass to CUDA builds")
+option(ENABLE_CUB "Use cub for scans using CUDA" On)
+option(ENABLE_TESTS "Build tests" On)
+option(ENABLE_EXAMPLES "Build simple examples" On)
+option(ENABLE_MODULES "Enable modules in supporting compilers (clang)" On)
+option(ENABLE_WARNINGS "Enable warnings as errors for CI" Off)
+option(ENABLE_DOCUMENTATION "Build RAJA documentation" Off)
+option(ENABLE_COVERAGE "Enable coverage (only supported with GCC)" Off)
 
 set(TEST_DRIVER "" CACHE STRING "driver used to wrap test commands")
 
+if (NOT BLT_LOADED) 
+if (NOT EXISTS ${PROJECT_SOURCE_DIR}/blt/SetupBLT.cmake)
+  message(FATAL_ERROR "\
+  The BLT submodule is not present. \
+  If in a git repo run the following command:\n\
+  git submodule init && git submodule update")
+endif()
+
+include(blt/SetupBLT.cmake)
+endif()
+
 # Setup basic CMake options
 include(cmake/SetupBasics.cmake)
 # Find third-party packages
@@ -81,44 +68,83 @@ include(cmake/SetupCompilers.cmake)
 include(cmake/SetupRajaConfig.cmake)
 # Macros for building executables and libraries
 include (cmake/RAJAMacros.cmake)
-# Sanity check for compiler compatibility
-include (cmake/CompilerCompatibility.cmake)
 
-include_directories(${PROJECT_BINARY_DIR}/include/RAJA)
-include_directories(${PROJECT_BINARY_DIR}/include)
+set (raja_sources
+  src/AlignedRangeIndexSetBuilders.cpp
+  src/DepGraphNode.cpp
+  src/LockFreeIndexSetBuilders.cpp
+  src/MemUtils_CUDA.cpp
+  src/ThreadUtils_CPU.cpp)
+
+set (raja_depends)
 
-include_directories(include)
+if (ENABLE_OPENMP)
+  set (raja_depends
+    openmp)
+endif()
+
+if (ENABLE_CUDA)
+  set (raja_depends
+    ${raja_depends}
+    cuda)
+endif ()
+
+if (ENABLE_CUDA)
+  if (ENABLE_CUB)
+    set (raja_depends
+      ${raja_depends}
+      cub)
+  endif ()
+endif ()
+
+if (ENABLE_CHAI)
+  set (raja_depends
+    ${raja_depends}
+    chai)
+endif ()
+
+if (ENABLE_TBB)
+  set(raja_depends
+    ${raja_depends}
+    tbb)
+endif ()
+
+blt_add_library(
+  NAME RAJA
+  SOURCES ${raja_sources}
+  DEPENDS_ON ${raja_depends})
+
+install(TARGETS RAJA
+  EXPORT RAJA
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION lib
+)
+
+install(EXPORT RAJA DESTINATION share/raja/cmake/)
+
+target_include_directories(RAJA
+  PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+  $<INSTALL_INTERFACE:include>)
 
 install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN *.hpp)
-install(FILES ${PROJECT_BINARY_DIR}/include/RAJA/config.hpp
-        DESTINATION "include/RAJA")
 
-add_subdirectory(src)
+install(FILES
+  ${PROJECT_BINARY_DIR}/include/RAJA/config.hpp
+  include/RAJA/module.modulemap
+  include/RAJA/module.private.modulemap
+  DESTINATION "include/RAJA/")
 
-if(RAJA_ENABLE_TESTS)
+if(ENABLE_TESTS)
   add_subdirectory(test)
 endif()
 
-if(RAJA_ENABLE_EXAMPLES)
+if(ENABLE_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
-if (RAJA_ENABLE_DOCUMENTATION)
+if (ENABLE_DOCUMENTATION)
   add_subdirectory(docs)
 endif ()
-
-if(RAJA_ENABLE_APPLICATIONS)
-  if (NOT EXISTS ${PROJECT_SOURCE_DIR}/extra/llnl-raja-proxies/CMakeLists.txt)
-    message(STATUS "Cloning RAJA proxy applications...")
-    execute_process(COMMAND git clone https://github.com/LLNL/RAJA-examples.git ${PROJECT_SOURCE_DIR}/extra/llnl-raja-proxies)
-  endif()
-  add_subdirectory(extra/llnl-raja-proxies)
-endif()
-
-if(RAJA_ENABLE_PERFSUITE)
-  if (NOT EXISTS ${PROJECT_SOURCE_DIR}/extra/performance/CMakeLists.txt)
-    message(STATUS "Cannot find performance suite")
-    message(STATUS "Clone it to ./extra/performance")
-  endif()
-  add_subdirectory(extra/performance)
-endif()

Dockerfile

@@ -8,6 +8,6 @@ RUN cd /opt/ && git clone https://github.com/LLNL/RAJA.git
 
 WORKDIR /opt/RAJA
 
-RUN mkdir build && cd build && cmake -DRAJA_ENABLE_CUDA=ON ..
+RUN mkdir build && cd build && cmake -DENABLE_CUDA=ON ..
 
 RUN cd build && make -j && make install

LICENSE

@@ -1,32 +1,5 @@
-*******************************************************************************
-
-RAJA: ................................, version 0.3.1
-
-Copyright (c) 2016, Lawrence Livermore National Security, LLC. 
-Produced at the Lawrence Livermore National Laboratory.
-All rights reserved. See details below.
-
-Unlimited Open Source - BSD Distribution
-LLNL-CODE-689114
-OCEC-16-063
-
-The original developers of RAJA are:
-
-Rich Hornung ([email protected])
-Jeff Keasler ([email protected])
-
-Contributors include:
-
-David Beckingsale ([email protected])
-Jason Burmark ([email protected])
-Holger Jones ([email protected])
-Will Killian ([email protected])
-Adam Kunen ([email protected])
-Olga Pearce ([email protected])
-David Poliakoff ([email protected])
-Tom Scogland ([email protected])
-
-*******************************************************************************
+Copyright (c) 2016-17, Lawrence Livermore National Security, LLC.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
@@ -53,25 +26,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional BSD Notice
-
-1. This notice is required to be provided under our contract with the U.S. 
-Department of Energy (DOE). This work was produced at Lawrence Livermore 
-National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
-
-2. Neither the United States Government nor Lawrence Livermore National 
-Security, LLC nor any of their employees, makes any warranty, express or 
-implied, or assumes any liability or responsibility for the accuracy, 
-completeness, or usefulness of any information, apparatus, product, or 
-process disclosed, or represents that its use would not infringe 
-privately-owned rights.
-
-3. Also, reference herein to any specific commercial products, process, 
-or services by trade name, trademark, manufacturer or otherwise does not 
-necessarily constitute or imply its endorsement, recommendation, or favoring 
-by the United States Government or Lawrence Livermore National Security, LLC. 
-The views and opinions of authors expressed herein do not necessarily state 
-or reflect those of the United States Government or Lawrence Livermore 
-National Security, LLC, and shall not be used for advertising or product 
-endorsement purposes.

NOTICE

@@ -0,0 +1,21 @@
+Additional BSD Notice
+
+1. This notice is required to be provided under our contract with the U.S. 
+Department of Energy (DOE). This work was produced at Lawrence Livermore 
+National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
+
+2. Neither the United States Government nor Lawrence Livermore National 
+Security, LLC nor any of their employees, makes any warranty, express or 
+implied, or assumes any liability or responsibility for the accuracy, 
+completeness, or usefulness of any information, apparatus, product, or 
+process disclosed, or represents that its use would not infringe 
+privately-owned rights.
+
+3. Also, reference herein to any specific commercial products, process, 
+or services by trade name, trademark, manufacturer or otherwise does not 
+necessarily constitute or imply its endorsement, recommendation, or favoring 
+by the United States Government or Lawrence Livermore National Security, LLC. 
+The views and opinions of authors expressed herein do not necessarily state 
+or reflect those of the United States Government or Lawrence Livermore 
+National Security, LLC, and shall not be used for advertising or product 
+endorsement purposes.