Merge branch 'develop' into task/2023_07_data_acc_set

LLNL · Feb 2, 2024 · ad1957c · ad1957c
2 parents 4f5da86 + 1451ff8
commit ad1957c
Show file tree

Hide file tree

Showing 209 changed files with 19,800 additions and 8,836 deletions.
diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
@@ -39,7 +39,7 @@ jobs:
                                 libhdf5-dev 
     - name: Setup Python Env
       run: python3 -m pip install --upgrade pip numpy mpi4py
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Build & Test

diff --git a/.github/workflows/uberenv_install.yml b/.github/workflows/uberenv_install.yml
@@ -7,42 +7,43 @@ on:
 jobs:
   uberenv_install_ubuntu_latest:
     name: Uberenv Install ubuntu-latest
+    container: alpinedav/ascent-ci:ubuntu-22.04-devel
     runs-on: ubuntu-latest
     steps:
-    - name: Install Deps
-      run: |
-           sudo apt-get update
-           sudo apt-get install binutils \
-                                gcc \
-                                g++ \
-                                gfortran \
-                                python3 \
-                                perl \
-                                git \
-                                git-lfs \
-                                curl \
-                                wget \
-                                tar \
-                                unzip \
-                                build-essential \
-                                libncurses-dev \
-                                libssl-dev \
-                                libblas-dev \
-                                liblapack-dev \
-                                zlib1g-dev \
-                                libgdbm-dev \
-                                libreadline-dev \
-                                libsqlite3-dev \
-                                libbz2-dev \
-                                mpich \
-                                libmpich-dev \
-                                libhdf5-dev 
-    - uses: actions/checkout@v2
+    # - name: Install Deps
+    #   run: |
+    #        sudo apt-get update
+    #        sudo apt-get install binutils \
+    #                             gcc \
+    #                             g++ \
+    #                             gfortran \
+    #                             python3 \
+    #                             perl \
+    #                             git \
+    #                             git-lfs \
+    #                             curl \
+    #                             wget \
+    #                             tar \
+    #                             unzip \
+    #                             build-essential \
+    #                             libncurses-dev \
+    #                             libssl-dev \
+    #                             libblas-dev \
+    #                             liblapack-dev \
+    #                             zlib1g-dev \
+    #                             libgdbm-dev \
+    #                             libreadline-dev \
+    #                             libsqlite3-dev \
+    #                             libbz2-dev \
+    #                             mpich \
+    #                             libmpich-dev \
+    #                             libhdf5-dev
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install
       run: |
-        python3 scripts/uberenv/uberenv.py --install --prefix="build"
+        python3 scripts/uberenv/uberenv.py --install --prefix="build" --spack-config-dir=scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_18.04_devel/
 
 
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build_windows_msvc_base:
-    name: MSVC Base Release
+    name: MSVC 2019 Default Release
     runs-on: windows-2019
     steps:
     - name: Setup MPI
@@ -25,6 +25,48 @@ jobs:
         cmake --build build --config Release --parallel 2
         cmake -E env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target RUN_TESTS --parallel 1
 
+  build_windows_msvc_base_cpp14:
+    name: MSVC 2019 C++14 Release
+    runs-on: windows-2019
+    steps:
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
+    - name: Setup Python Env
+      run: python3 -m pip install --upgrade pip numpy mpi4py
+    - uses: actions/checkout@v4
+      with: 
+        submodules: 'recursive'
+    - name: Build & Test
+      run: |
+        cmake -S src -B build            `
+              -DBLT_CXX_STD=c++14        `
+              -DCMAKE_BUILD_TYPE=Release `
+              -DENABLE_PYTHON=ON         `
+              -DENABLE_MPI=ON
+        cmake --build build --config Release --parallel 2
+        cmake -E env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target RUN_TESTS --parallel 1
+
+  build_windows_msvc_base_cpp17:
+    name: MSVC 2022 C++17 Release
+    runs-on: windows-2022
+    steps:
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
+    - name: Setup Python Env
+      run: python3 -m pip install --upgrade pip numpy mpi4py
+    - uses: actions/checkout@v4
+      with: 
+        submodules: 'recursive'
+    - name: Build & Test
+      run: |
+        cmake -S src -B build            `
+              -DBLT_CXX_STD=c++17        `
+              -DCMAKE_BUILD_TYPE=Release `
+              -DENABLE_PYTHON=ON         `
+              -DENABLE_MPI=ON
+        cmake --build build --config Release --parallel 2
+        cmake -E env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target RUN_TESTS --parallel 1
+
   build_windows_msvc_py_ver:
     name: MSVC Release Py Verison
     runs-on: windows-2019
@@ -42,7 +84,7 @@ jobs:
       uses: mpi4py/setup-mpi@v1
     - name: Setup Python Env
       run: python3 -m pip install --upgrade pip numpy mpi4py
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with: 
         submodules: 'recursive'
     - name: Build & Test
@@ -61,7 +103,7 @@ jobs:
     steps:
     - name: Setup Python Env
       run: python3 -m pip install --upgrade pip numpy
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with: 
         submodules: 'recursive'
     - uses: seanmiddleditch/gha-setup-ninja@master

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -14,6 +14,8 @@ build:
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
    configuration: src/docs/sphinx/conf.py
-# If using Sphinx, optionally build your docs in additional formats such as PDF
-# formats:
-#    - pdf
+# Set requirements required to build your docs
+python:
+  install:
+    - requirements: src/docs/sphinx/requirements.txt
+