Merge branch 'master' into string-reg-opt

Bears-R-Us · May 21, 2024 · c63837c · c63837c
2 parents 19153b0 + af41bb8
commit c63837c
Show file tree

Hide file tree

Showing 29 changed files with 960 additions and 454 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -91,6 +91,38 @@ jobs:
       run: |
         make test-python
 
+  arkouda_proto_python_portability:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.x']
+    container:
+      image: chapel/chapel:1.33.0
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{matrix.python-version}}
+    - name: Install dependencies
+      run: |
+        apt-get update && apt-get install -y -V ca-certificates lsb-release wget
+        wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+        apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+        apt-get update && apt-get install -y libhdf5-dev hdf5-tools libzmq3-dev python3-pip libarrow-dev libparquet-dev libcurl4-openssl-dev libidn2-dev
+        make install-iconv
+        echo "\$(eval \$(call add-path,/usr/lib/x86_64-linux-gnu/hdf5/serial/))" >> Makefile.paths
+    - name: Check python version
+      run: |
+        python3 --version
+    - name: Build/Install Arkouda
+      run: |
+        make
+        python3 -m pip install -e .[dev]
+    - name: Arkouda unit tests
+      run: |
+        make test-python-proto size=100
+
   arkouda_chpl_portability:
     runs-on: ubuntu-latest
     strategy:
@@ -119,6 +151,34 @@ jobs:
       run: |
         make test-python
 
+  arkouda_proto_chpl_portability:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        chpl-version: ['1.31.0', '1.32.0']
+    container:
+      image: chapel/chapel:${{matrix.chpl-version}}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install dependencies
+      run: |
+        apt-get update && apt-get install -y -V ca-certificates lsb-release wget
+        wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+        apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+        apt-get update && apt-get install -y libhdf5-dev hdf5-tools libzmq3-dev python3-pip libarrow-dev libparquet-dev libcurl4-openssl-dev libidn2-dev
+        make install-iconv
+        echo "\$(eval \$(call add-path,/usr/lib/x86_64-linux-gnu/hdf5/serial/))" >> Makefile.paths
+    - name: Check chpl version
+      run: |
+        chpl --version
+    - name: Build/Install Arkouda
+      run: |
+        make
+        python3 -m pip install -e .[dev]
+    - name: Arkouda unit tests
+      run: |
+        make test-python-proto size=100
+
   arkouda_tests_linux:
     runs-on: ubuntu-latest
     strategy:
@@ -160,3 +220,45 @@ jobs:
       run: |
         ./benchmarks/run_benchmarks.py --correctness-only
         ./benchmarks/run_benchmarks.py --size=100 --gen-graphs
+
+  arkouda_proto_tests_linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - image: chapel
+            threads: 2
+#          - image: chapel-gasnet-smp
+#            threads: 1
+    env:
+      CHPL_RT_NUM_THREADS_PER_LOCALE: ${{matrix.threads}}
+    container:
+      image: chapel/${{matrix.image}}:1.33.0
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install dependencies
+      run: |
+        apt-get update && apt-get install -y -V ca-certificates lsb-release wget
+        wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+        apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+        apt-get update && apt-get install -y libhdf5-dev hdf5-tools libzmq3-dev python3-pip libarrow-dev libparquet-dev libcurl4-openssl-dev libidn2-dev
+        make install-iconv
+        echo "\$(eval \$(call add-path,/usr/lib/x86_64-linux-gnu/hdf5/serial/))" >> Makefile.paths
+    - name: Build/Install Arkouda
+      run: |
+        make
+        python3 -m pip install -e .[dev]
+    - name: Arkouda make check
+      run: |
+        make check
+    - name: Arkouda unit tests
+      if: matrix.image != 'chapel-gasnet-smp'
+      env:
+        ARKOUDA_PYTEST_OPTIONS: "--durations=0 --durations-min=5.0"
+      run: |
+        make test-python-proto size=100
+    - name: Arkouda benchmark --correctness-only
+      if: matrix.image != 'chapel-gasnet-smp'
+      run: |
+        ./benchmarks/run_benchmarks.py --correctness-only
+        ./benchmarks/run_benchmarks.py --size=100 --gen-graphs
diff --git a/Makefile b/Makefile
@@ -529,7 +529,7 @@ test-python:
 
 size=100
 test-python-proto:
-	python3 -m pytest --size=$(size) $(ARKOUDA_PYTEST_OPTIONS) -c pytest_PROTO.ini
+	python3 -m pytest -c pytest_PROTO.ini --size=$(size) $(ARKOUDA_PYTEST_OPTIONS)
 
 CLEAN_TARGETS += test-clean
 .PHONY: test-clean