From a1bba50a493d5018c9e942889158f2f054d894ff Mon Sep 17 00:00:00 2001 From: "Pappas, Jack" Date: Thu, 16 Jun 2022 14:27:12 -0400 Subject: [PATCH 1/5] Add builds targeting numpy 1.22 now that numba 0.55.2 supports it. --- .editorconfig | 10 ++++++ .github/workflows/native_sanity.yml | 50 ++++++++++++++++++++++++++-- .github/workflows/python_package.yml | 7 ++-- 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index aff6ec47..9e9d768c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,3 +8,13 @@ indent_size = 4 tab_width = 4 charset = utf-8 #trim_trailing_whitespace = true + +# YAML config files +[*.{yml,yaml}] +indent_size = 2 + +# Shell scripts +[*.sh] +end_of_line = lf +[*.{cmd, bat}] +end_of_line = crlf diff --git a/.github/workflows/native_sanity.yml b/.github/workflows/native_sanity.yml index 78df47ba..cf3e6614 100644 --- a/.github/workflows/native_sanity.yml +++ b/.github/workflows/native_sanity.yml @@ -35,7 +35,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install numpy==1.21 + python -m pip install numpy==1.22 python -m pip install riptable working-directory: ${{ env.working-directory }} - name: Create Cmake build directory @@ -88,7 +88,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install numpy==1.21 + python -m pip install numpy==1.22 python -m pip install riptable working-directory: ${{ env.working-directory }} - name: Create Cmake build directory @@ -208,3 +208,49 @@ jobs: build/test/riptide_test/riptide_test build/test/riptide_python_test/riptide_python_test working-directory: ${{ env.working-directory }} + + build-cmake-ubuntu-122: + + runs-on: ${{ matrix.os }} + env: + working-directory: ./ + strategy: + matrix: + os: [ubuntu-latest] + python-version: ['3.10'] + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + # Set fetch-depth to 0 so all history is retrieved; this is needed so we get the git tags + # which we use for setting the package version (via setuptools-scm). + fetch-depth: 0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install numpy==1.22 + python -m pip install riptable + working-directory: ${{ env.working-directory }} + - name: Create Cmake build directory + run: | + cmake -E make_directory "build" + working-directory: ${{ env.working-directory }} + - name: Setup CMake Relase configuration + run: | + cmake -E chdir "build" cmake -DCMAKE_BUILD_TYPE=Release "-DRIPTIDE_PYTHON_VER=${{ matrix.python-version }}" ../ + working-directory: ${{ env.working-directory }} + - name: Build Release via CMake + run: | + cmake --build "build" --config Release + working-directory: ${{ env.working-directory }} + - name: Run the Release tests and benchmarks + run: | + build/bench/riptide_bench/riptide_bench/riptide_bench + build/test/riptide_test/riptide_test + build/test/riptide_python_test/riptide_python_test + working-directory: ${{ env.working-directory }} \ No newline at end of file diff --git a/.github/workflows/python_package.yml b/.github/workflows/python_package.yml index 7bc95459..df0d8449 100644 --- a/.github/workflows/python_package.yml +++ b/.github/workflows/python_package.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-latest, windows-2019] python-version: [3.8, 3.9, '3.10'] - numpy-version: [1.21] + numpy-version: [1.21, 1.22] steps: - uses: actions/checkout@v2 with: @@ -123,9 +123,12 @@ jobs: zips: [ { python: '3.8', numpy: '1.20' }, { python: '3.8', numpy: '1.21' }, + { python: '3.8', numpy: '1.22' }, { python: '3.9', numpy: '1.20' }, { python: '3.9', numpy: '1.21' }, - { python: '3.10', numpy: '1.21' } + { python: '3.9', numpy: '1.22' }, + { python: '3.10', numpy: '1.21' }, + { python: '3.10', numpy: '1.22' } ] env: python_version: 3.9 From 3f884a38c2b367d508fcf970e12de443ce4f19c2 Mon Sep 17 00:00:00 2001 From: "Pappas, Jack" Date: Thu, 23 Jun 2022 16:47:41 -0400 Subject: [PATCH 2/5] Allow numpy revision to float to the latest within a given minor version. --- .github/workflows/python_package.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_package.yml b/.github/workflows/python_package.yml index df0d8449..8ef373fd 100644 --- a/.github/workflows/python_package.yml +++ b/.github/workflows/python_package.yml @@ -33,10 +33,13 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies + # NOTE: For numpy 1.22, there was a regression in ufunc handling in numpy 1.22.0. It was fixed in 1.22.3, + # so let `pip` install the latest revision of each minor version being tested. This is also closer to + # the behavior of the conda-based builds. run: | python -m pip install --upgrade pip python -m pip install setuptools-scm wheel - python -m pip install numpy==${{ matrix.numpy-version }} + python -m pip install numpy==${{ matrix.numpy-version }}.* - name: Build with python setup.py run: | python setup.py build --force From 29576f05274ff90b5ddf1f017b2d28da987c7f9e Mon Sep 17 00:00:00 2001 From: "Pappas, Jack" Date: Fri, 24 Jun 2022 08:14:27 -0400 Subject: [PATCH 3/5] One more fix for numpy 1.22 builds. --- .github/workflows/native_sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/native_sanity.yml b/.github/workflows/native_sanity.yml index cf3e6614..f9fc03b9 100644 --- a/.github/workflows/native_sanity.yml +++ b/.github/workflows/native_sanity.yml @@ -233,7 +233,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install numpy==1.22 + python -m pip install numpy==1.22.* python -m pip install riptable working-directory: ${{ env.working-directory }} - name: Create Cmake build directory From 28cc0328f1bf0194f9bca4bd5bab90c383466c66 Mon Sep 17 00:00:00 2001 From: "Pappas, Jack" Date: Fri, 24 Jun 2022 08:16:07 -0400 Subject: [PATCH 4/5] Hopefully the last fix for numpy 1.22 builds. --- .github/workflows/native_sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/native_sanity.yml b/.github/workflows/native_sanity.yml index f9fc03b9..fa13e8bd 100644 --- a/.github/workflows/native_sanity.yml +++ b/.github/workflows/native_sanity.yml @@ -88,7 +88,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install numpy==1.22 + python -m pip install numpy==1.22.* python -m pip install riptable working-directory: ${{ env.working-directory }} - name: Create Cmake build directory From 5695f1412d31c5c7e5fed255dda2377ba3c8e955 Mon Sep 17 00:00:00 2001 From: "Pappas, Jack" Date: Fri, 24 Jun 2022 08:19:48 -0400 Subject: [PATCH 5/5] Third time's a charm, hopefully. --- .github/workflows/native_sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/native_sanity.yml b/.github/workflows/native_sanity.yml index fa13e8bd..baecd1fa 100644 --- a/.github/workflows/native_sanity.yml +++ b/.github/workflows/native_sanity.yml @@ -35,7 +35,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install numpy==1.22 + python -m pip install numpy==1.22.* python -m pip install riptable working-directory: ${{ env.working-directory }} - name: Create Cmake build directory