Merge pull request picassodev#103 from streeve/min_cabana

Update minimum Cabana

.github/workflows/CI.yml

@@ -18,14 +18,14 @@ jobs:
         cxx: ['g++', 'clang++']
         openmp: ['ON', 'OFF']
         cmake_build_type: ['Debug', 'Release']
-        kokkos_ver: ['3.7.01']
+        kokkos_ver: ['4.1.00']
         coverage: ['OFF']
         include:
           - distro: 'ubuntu:latest'
             cxx: 'g++'
             openmp: 'ON'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.01'
+            kokkos_ver: '4.1.00'
             coverage: 'ON'
     runs-on: ubuntu-20.04
     container: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
@@ -72,7 +72,7 @@ jobs:
         uses: actions/checkout@v2.2.0
         with:
           repository: ECP-CoPA/Cabana
-          ref: 0.6.0
+          ref: 0.6.1
           path: cabana
       - name: Build Cabana
         working-directory: cabana
@@ -130,11 +130,5 @@ jobs:
       - name: Test Picasso
         run: |
           CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test
-      - name: Format Picasso
-        if: ${{ matrix.distro == 'ubuntu:latest' }}
-        working-directory: build
-        run: |
-             make picasso-format
-             git diff --exit-code
       - name: Upload Report to codecov.io
         uses: codecov/codecov-action@v1

.github/workflows/Format.yml

@@ -0,0 +1,12 @@
+name: Clang-Format Check
+on: [push, pull_request]
+jobs:
+  formatting-check:
+    name: Formatting Check
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run clang-format style check
+      uses: jidicula/clang-format-action@v4.6.2
+      with:
+        clang-format-version: '14'

.github/workflows/Nightly.yml

@@ -106,11 +106,3 @@ jobs:
       - name: Test Picasso
         run: |
           CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test
-      - name: Format Picasso
-        if: ${{ matrix.distro == 'ubuntu:latest' }}
-        working-directory: build
-        run: |
-             make picasso-format
-             git diff --exit-code
-      - name: Upload Report to codecov.io
-        uses: codecov/codecov-action@v1

CMakeLists.txt

@@ -2,7 +2,8 @@
 cmake_minimum_required(VERSION 3.12)
 
 # FIXME: C language only for Cabana HDF5
-project(Picasso LANGUAGES CXX C VERSION 0.1.0)
+project(Picasso LANGUAGES CXX C)
+set(PROJECT_VERSION "0.2.0-dev")
 
 include(GNUInstallDirs)
 
@@ -12,7 +13,7 @@ option(Picasso_REQUIRE_ARBORX "Build with ArborX support" OFF)
 # find dependencies (MPI and Kokkos found through Cabana)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 find_package(CLANG_FORMAT 10)
-find_package(Cabana REQUIRED 0.5 COMPONENTS Cabana::Grid Cabana::Core)
+find_package(Cabana REQUIRED 0.6.1 COMPONENTS Cabana::Grid Cabana::Core)
 find_package(Boost 1.66.0 REQUIRED)
 
 # Build with ArborX if available or if requested.
@@ -22,10 +23,6 @@ if(Picasso_REQUIRE_ARBORX OR ArborX_FOUND)
   find_package(ArborX REQUIRED)
 endif()
 
-if(Kokkos_VERSION_MAJOR LESS 4 AND Kokkos_VERSION_MINOR LESS 7)
-  message( FATAL_ERROR "Picasso requires Kokkos >= 3.7" )
-endif()
-
 option( Picasso_REQUIRE_SILO "Require Picasso to build with Cabana Silo support" OFF )
 if( Picasso_REQUIRE_SILO AND NOT Cabana_ENABLE_SILO )
     message( FATAL_ERROR "Cabana was not compiled with SILO" )