resolving conflicts

Author: sumit-walia

.github/workflows/ci.yml

@@ -3,12 +3,93 @@ on:
   push:
     branches:
       - main
-      - base     
+      - base   
 
 permissions:
   contents: write
 
 jobs:
+  build_cpu:
+    name: Build CPU (Linux, macOS)
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: bash ./install/installDependencies.sh
+
+      - name: Build CPU
+        run: |
+          cd install
+          bash ./installDIPPER.sh cpu
+
+      - name: Run CPU binary
+        run: ./bin/dipper_cpu --help
+
+  build_gpu:
+    name: Build GPU (Linux, if available)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Detect NVIDIA GPU + CUDA
+        id: detect_nvidia
+        run: |
+          if command -v nvidia-smi >/dev/null 2>&1 && nvidia-smi -L >/dev/null 2>&1 && command -v nvcc >/dev/null 2>&1; then
+            echo "available=true" >> "${GITHUB_OUTPUT}"
+          else
+            echo "available=false" >> "${GITHUB_OUTPUT}"
+          fi
+
+      - name: Detect AMD GPU + HIP
+        id: detect_amd
+        run: |
+          if command -v hipcc >/dev/null 2>&1; then
+            if command -v rocminfo >/dev/null 2>&1 && rocminfo >/dev/null 2>&1; then
+              echo "available=true" >> "${GITHUB_OUTPUT}"
+              exit 0
+            fi
+            if command -v rocm-smi >/dev/null 2>&1 && rocm-smi -i >/dev/null 2>&1; then
+              echo "available=true" >> "${GITHUB_OUTPUT}"
+              exit 0
+            fi
+          fi
+          echo "available=false" >> "${GITHUB_OUTPUT}"
+
+      - name: Install dependencies
+        if: steps.detect_nvidia.outputs.available == 'true' || steps.detect_amd.outputs.available == 'true'
+        run: bash ./install/installDependencies.sh
+
+      - name: Build NVIDIA GPU
+        if: steps.detect_nvidia.outputs.available == 'true'
+        run: |
+          cd install
+          bash ./installDIPPER.sh cuda
+
+      - name: Run NVIDIA GPU binary
+        if: steps.detect_nvidia.outputs.available == 'true'
+        run: ./bin/dipper --help
+
+      - name: Build AMD GPU
+        if: steps.detect_amd.outputs.available == 'true'
+        run: |
+          cd install
+          bash ./installDIPPER.sh hip
+
+      - name: Run AMD GPU binary
+        if: steps.detect_amd.outputs.available == 'true'
+        run: ./bin/dipper --help
+
+      - name: Skip GPU build
+        if: steps.detect_nvidia.outputs.available != 'true' && steps.detect_amd.outputs.available != 'true'
+        run: echo "No GPU/toolchain detected. Skipping GPU build."
+
   deploy:
     name: Deploy Job
     runs-on: ubuntu-latest
@@ -31,4 +112,4 @@ jobs:
         run: |
           pip install mkdocs-material
           pip install "mkdocs-material[imaging]"
-          mkdocs gh-deploy --force
+          mkdocs gh-deploy --force

.vscode/settings.json

@@ -0,0 +1,87 @@
+{
+    "files.associations": {
+        "queue": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "csetjmp": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "strstream": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cfenv": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "coroutine": "cpp",
+        "cstdint": "cpp",
+        "cuchar": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "ranges": "cpp",
+        "regex": "cpp",
+        "scoped_allocator": "cpp",
+        "shared_mutex": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "valarray": "cpp",
+        "variant": "cpp",
+        "semaphore": "cpp"
+    }
+}