Merge pull request #115 from pnnl/dev-new

Merge dev-new into master

Author: pthomadakis

.github/workflows/Ubuntu-latest.yml

@@ -1,20 +1,21 @@
 # This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
 # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
 name: Test on Ubuntu Linux
-
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "dev-new"]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "dev-new"]
+  workflow_dispatch:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
   COMET_SRC: ${{github.workspace}}
-
+  COMETPY_COMET_PATH: ${{github.workspace}}/build/comet/
+  COMETPY_LLVM_PATH: ${{github.workspace}}/build/llvm/src/llvm-build
 jobs:
-  build-and-test-comet:
+  build-comet-and-dependencies:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
@@ -33,51 +34,46 @@ jobs:
       with:
         path: |
           ${{github.workspace}}/llvm
-          ${{github.workspace}}/blis/
-          ${{github.workspace}}/install/
-          ${{github.workspace}}/build/
+          ${{github.workspace}}/build/llvm
+          ${{github.workspace}}/build/blis
         key: ${{ runner.os }}-submodules
 
-    - name: Update git submodules
+    - name: Build clean
       if: steps.cache-submodule.outputs.cache-hit != 'true'
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
+      run: mkdir ${{github.workspace}}/build && cd ${{github.workspace}}/build && cmake ../ -DCMAKE_BUILD_TYPE=Release && make
 
-    - name: Build llvm
-      if: steps.cache-submodule.outputs.cache-hit != 'true'
-      run: mkdir ${{github.workspace}}/llvm/build && cd llvm/build/ && cmake -G Ninja ../llvm -DLLVM_ENABLE_PROJECTS="mlir;openmp;clang" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_ASSERTIONS=ON -DCMAKE_BUILD_TYPE=Release && ninja
+    - name: Build from cached
+      if: steps.cache-submodule.outputs.cache-hit == 'true'
+      run: cd ${{github.workspace}}/build && cmake ../ -DCMAKE_BUILD_TYPE=Release -DLLVM_CUSTOM_BUILD_PATH=${{github.workspace}}/build/llvm/src/llvm-build -DCMAKE_BUILD_TYPE=Release && make
 
-    - name: Build blis
-      if: steps.cache-submodule.outputs.cache-hit != 'true'
-      run: cd ${{github.workspace}} && patch -s -p0 < comet-blis.patch && cd blis && ./configure --prefix=$COMET_SRC/install --disable-shared auto && make && make install
 
-    - name: Build COMET
-      # Build your program with the given configuration
-      run: rm -rf ${{github.workspace}}/build && mkdir ${{github.workspace}}/build && cd ${{github.workspace}}/build && cmake -G Ninja .. -DMLIR_DIR=${{github.workspace}}/llvm/build/lib/cmake/mlir -DLLVM_DIR=${{github.workspace}}/llvm/build/lib/cmake/llvm -DLLVM_ENABLE_ASSERTIONS=ON -DCMAKE_BUILD_TYPE=Release && ninja 
+  test-comet-backend:
 
-  # test-comet-backend:
-
-  #   needs: build-comet
-  #   runs-on: ubuntu-latest
+    needs: build-comet-and-dependencies
+    runs-on: ubuntu-latest
 
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   # - uses: lukka/get-cmake@latest
-  #   - name: Install CMake
-  #     run: sudo apt-get install cmake && sudo apt-get install ninja-build
+    steps:
+    - uses: actions/checkout@v4
+    # - uses: lukka/get-cmake@latest
+    - name: Install CMake
+      run: sudo apt-get install cmake && sudo apt-get install ninja-build
 
-  #   - name: Cache Submodules
-  #     id: cache-submodule
-  #     uses: actions/cache@v4
-  #     # if: always()
-  #     with:
-  #       path: |
-  #         ${{github.workspace}}/llvm
-  #         ${{github.workspace}}/blis/
-  #         ${{github.workspace}}/install/
-  #         ${{github.workspace}}/build/
-  #       key: ${{ runner.os }}-submodules
+
+    - name: Cache Submodules
+      id: cache-submodule
+      uses: actions/cache@v4
+      # if: always()
+      with:
+        path: |
+          ${{github.workspace}}/llvm
+          ${{github.workspace}}/build/llvm
+          ${{github.workspace}}/build/blis
+        key: ${{ runner.os }}-submodules
+
+    - name: Build COMET
+      working-directory: ${{github.workspace}}/build/
+      # Build your program with the given configuration
+      run: cmake .. -DLLVM_CUSTOM_BUILD_PATH=${{github.workspace}}/build/llvm/src/llvm-build -DCMAKE_BUILD_TYPE=Release && make
 
     - name: Initialize Python 3.11
       uses: actions/setup-python@v4
@@ -91,7 +87,7 @@ jobs:
           sudo apt-get install -y python3-pip
            
     - name: Test
-      working-directory: ${{github.workspace}}/build
+      working-directory: ${{github.workspace}}/build/comet/
       shell: bash
 
       run: ninja check-comet-integration
@@ -129,7 +125,7 @@ jobs:
   #       cargo test
 
   test-cometpy:
-    needs: build-and-test-comet
+    needs: build-comet-and-dependencies
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -141,9 +137,8 @@ jobs:
       with:
         path: |
           ${{github.workspace}}/llvm
-          ${{github.workspace}}/blis/
-          ${{github.workspace}}/install/
-          ${{github.workspace}}/build/
+          ${{github.workspace}}/build/llvm
+          ${{github.workspace}}/build/blis
         key: ${{ runner.os }}-submodules
 
     - name: Initialize Python 3.11
@@ -152,10 +147,23 @@ jobs:
       with:
           python-version: 3.11
 
+    - name: Install python dependencies
+      run: |
+          sudo apt-get install -y python3-pip
+          
+    - name: Build COMET
+      working-directory: ${{github.workspace}}/build/
+      # Build your program with the given configuration
+      run: cmake .. -DLLVM_CUSTOM_BUILD_PATH=${{github.workspace}}/build/llvm/src/llvm-build -DCMAKE_BUILD_TYPE=Release && make
+
+      
     - name: Setup cometPy
       run: cd ${{github.workspace}}/frontends/numpy-scipy/ && pip3 install -e .
-    
+
+    - name: Install PyTest
+      run: pip3 install -U pytest
+
     - name: Test CometPy
       working-directory: ${{github.workspace}}/frontends/numpy-scipy/integration_tests/
 
-      run: python3 numpy_integration.py -v
+      run: pytest

.gitignore

@@ -19,4 +19,6 @@ lit.site.cfg.py
 .vscode
 /.idea
 
-# External software
+# Clangd
+/.cache
+

.gitmodules

@@ -7,3 +7,18 @@
 [submodule "triton"]
 	path = triton
 	url = https://github.com/triton-lang/triton.git
+[submodule "tools/llvm-spirv"]
+	path = tools/llvm-spirv
+	url = https://github.com/llvm/llvm-project.git
+	branch = release/7.x
+[submodule "tools/spirv-llvm-tranlate"]
+	path = tools/spirv-llvm-tranlate
+	url = https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git
+	branch = llvm_release_70
+[submodule "tools/spirv-llvm-translate"]
+	path = tools/spirv-llvm-translate
+	url = https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git
+	branch = llvm_release_70
+[submodule "runtimes/mcl"]
+	path = runtimes/mcl
+	url = https://github.com/pnnl/mcl.git