From fcec0b4a12b72dbe214d0ab73920c647e9db7c71 Mon Sep 17 00:00:00 2001 From: Guilherme Leobas Date: Fri, 12 May 2023 14:32:07 -0300 Subject: [PATCH 1/5] Add HeavyAI 6.4.4 and 7.0.0 from docker --- .github/workflows/rbc_test.yml | 49 ++++++++++++++++++++-------------- .heavyai/heavyai.conf | 3 ++- .omnisci/omnisci.conf | 2 +- docker-compose.yml | 3 ++- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/.github/workflows/rbc_test.yml b/.github/workflows/rbc_test.yml index 3b8a9e7f1..3cb72afec 100644 --- a/.github/workflows/rbc_test.yml +++ b/.github/workflows/rbc_test.yml @@ -107,28 +107,29 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] - python-version: ['3.10', '3.9', '3.8'] - numba-version: ['0.56', '0.55'] - heavydb-version: ['6.2', '6.1', '6.0'] - heavydb-from: [conda] - # include: - # - os: ubuntu-latest - # python-version: '3.10' - # numba-version: '0.56' - # heavydb-version: dev - # docker-image: heavyai/core-os-cpu-dev:latest - # heavydb-from: docker - # - os: ubuntu-latest - # python-version: '3.10' - # numba-version: '0.55' - # heavydb-version: dev - # docker-image: heavyai/core-os-cpu-dev:latest - # heavydb-from: docker - - needs: lint + # os: [ubuntu-latest] + # python-version: ['3.10', '3.9', '3.8'] + # numba-version: ['0.56', '0.55'] + # heavydb-version: ['6.2', '6.1', '6.0'] + # heavydb-from: [conda] + include: + - os: ubuntu-latest + python-version: '3.10' + numba-version: '0.56' + heavydb-version: '6.4.4' + docker-image: heavyai/heavyai-ee-cpu:v6.4.4 + heavydb-from: docker + - os: ubuntu-latest + python-version: '3.10' + numba-version: '0.56' + heavydb-version: '7.0.1' + docker-image: heavyai/heavyai-ee-cpu:v7.0.1 + heavydb-from: docker + + # needs: lint steps: + - name: Checkout code uses: actions/checkout@v2 @@ -160,6 +161,14 @@ jobs: run: | mamba create -n heavydb-env heavydb=${{ matrix.heavydb-version }}*=*_cpu -c conda-forge + - name: Configure secrets + shell: bash -l {0} + env: + HEAVYDB_LICENSE: ${{ secrets.HEAVYDB }} + run: | + # dump secrets to file + echo "${HEAVYDB_LICENSE}" > ./.heavyai/license.txt + - name: Build heavydb docker image and run it [docker] shell: bash -l {0} env: diff --git a/.heavyai/heavyai.conf b/.heavyai/heavyai.conf index 9918b798e..6c1c84579 100644 --- a/.heavyai/heavyai.conf +++ b/.heavyai/heavyai.conf @@ -1,5 +1,6 @@ enable-runtime-udfs = true enable-table-functions = true enable-dev-table-functions = true +enable-udf-registration-for-all-users = true cpu-only = true -log-severity = DEBUG4 \ No newline at end of file +license = "/var/lib/heavyai/license.txt" \ No newline at end of file diff --git a/.omnisci/omnisci.conf b/.omnisci/omnisci.conf index 0180a3145..8ac6649c8 100644 --- a/.omnisci/omnisci.conf +++ b/.omnisci/omnisci.conf @@ -3,4 +3,4 @@ enable-table-functions = true enable-dev-table-functions = true enable-udf-registration-for-all-users = true cpu-only = true -log-severity = DEBUG4 +license = license.txt \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 7278d41a4..82bffc140 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,4 +9,5 @@ services: - 6278:6278 - 6279:6279 volumes: - - ./.omnisci/omnisci.conf:/omnisci-storage/omnisci.conf \ No newline at end of file + - ./.heavyai/heavyai.conf:/var/lib/heavyai/heavy.conf + - ./.heavyai/license.txt:/var/lib/heavyai/license.txt From ecb54de14535959b179167732ce344ee79884321 Mon Sep 17 00:00:00 2001 From: Guilherme Leobas Date: Wed, 14 Jun 2023 15:01:35 -0300 Subject: [PATCH 2/5] restore commented blocks --- .github/workflows/rbc_test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rbc_test.yml b/.github/workflows/rbc_test.yml index 3cb72afec..fe0bc3323 100644 --- a/.github/workflows/rbc_test.yml +++ b/.github/workflows/rbc_test.yml @@ -107,11 +107,11 @@ jobs: strategy: fail-fast: false matrix: - # os: [ubuntu-latest] - # python-version: ['3.10', '3.9', '3.8'] - # numba-version: ['0.56', '0.55'] - # heavydb-version: ['6.2', '6.1', '6.0'] - # heavydb-from: [conda] + os: [ubuntu-latest] + python-version: ['3.10', '3.9', '3.8'] + numba-version: ['0.56', '0.55'] + heavydb-version: ['6.2', '6.1', '6.0'] + heavydb-from: [conda] include: - os: ubuntu-latest python-version: '3.10' @@ -126,7 +126,7 @@ jobs: docker-image: heavyai/heavyai-ee-cpu:v7.0.1 heavydb-from: docker - # needs: lint + needs: lint steps: From 9e78b45bddfed1fc956074789ffa2e0b96403b54 Mon Sep 17 00:00:00 2001 From: Guilherme Leobas Date: Thu, 15 Jun 2023 09:38:59 -0300 Subject: [PATCH 3/5] upd --- .github/workflows/rbc_test.yml | 1 - rbc/tests/heavydb/test_geolinestring.py | 2 +- rbc/tests/heavydb/test_geomultipolygon.py | 2 +- rbc/tests/heavydb/test_geopoint.py | 2 +- rbc/tests/heavydb/test_geopolygon.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rbc_test.yml b/.github/workflows/rbc_test.yml index fe0bc3323..6230fd621 100644 --- a/.github/workflows/rbc_test.yml +++ b/.github/workflows/rbc_test.yml @@ -235,7 +235,6 @@ jobs: RBC_TESTS_FULL: TRUE run: | mamba run -n rbc pytest -sv -r A rbc/tests/heavydb/ -x - pkill -f heavydb mamba run -n rbc pytest -sv -r A rbc/tests/ -x --ignore rbc/tests/heavydb - name: Run rbc tests diff --git a/rbc/tests/heavydb/test_geolinestring.py b/rbc/tests/heavydb/test_geolinestring.py index 8ee847a19..a40b22078 100644 --- a/rbc/tests/heavydb/test_geolinestring.py +++ b/rbc/tests/heavydb/test_geolinestring.py @@ -5,7 +5,7 @@ @pytest.fixture(scope='module') def heavydb(): - for o in heavydb_fixture(globals(), minimal_version=(6, 4), + for o in heavydb_fixture(globals(), minimal_version=(7, 0), suffices=['linestring', 'multilinestring', 'multipoint', 'polygon', 'multipolygon']): diff --git a/rbc/tests/heavydb/test_geomultipolygon.py b/rbc/tests/heavydb/test_geomultipolygon.py index 239537497..8d4015ee0 100644 --- a/rbc/tests/heavydb/test_geomultipolygon.py +++ b/rbc/tests/heavydb/test_geomultipolygon.py @@ -5,7 +5,7 @@ @pytest.fixture(scope='module') def heavydb(): - for o in heavydb_fixture(globals(), minimal_version=(6, 4), + for o in heavydb_fixture(globals(), minimal_version=(7, 0), suffices=['multipolygon']): define(o) yield o diff --git a/rbc/tests/heavydb/test_geopoint.py b/rbc/tests/heavydb/test_geopoint.py index d92de36bd..21d8fa18e 100644 --- a/rbc/tests/heavydb/test_geopoint.py +++ b/rbc/tests/heavydb/test_geopoint.py @@ -6,7 +6,7 @@ @pytest.fixture(scope='module') def heavydb(): - for o in heavydb_fixture(globals(), minimal_version=(6, 4), + for o in heavydb_fixture(globals(), minimal_version=(7, 0), suffices=['point']): define(o) yield o diff --git a/rbc/tests/heavydb/test_geopolygon.py b/rbc/tests/heavydb/test_geopolygon.py index 8a2b56b31..265d38e01 100644 --- a/rbc/tests/heavydb/test_geopolygon.py +++ b/rbc/tests/heavydb/test_geopolygon.py @@ -5,7 +5,7 @@ @pytest.fixture(scope='module') def heavydb(): - for o in heavydb_fixture(globals(), minimal_version=(6, 4), + for o in heavydb_fixture(globals(), minimal_version=(7, 0), suffices=['polygon']): define(o) yield o From c3cf30df29cb6c9fb2442c3d92e16583f924be66 Mon Sep 17 00:00:00 2001 From: Guilherme Leobas Date: Mon, 19 Jun 2023 14:19:45 -0300 Subject: [PATCH 4/5] fix command to show heayvdb log --- .github/workflows/rbc_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rbc_test.yml b/.github/workflows/rbc_test.yml index 6230fd621..8c435962a 100644 --- a/.github/workflows/rbc_test.yml +++ b/.github/workflows/rbc_test.yml @@ -285,7 +285,7 @@ jobs: timeout-minutes: 2 if: ${{ failure() && matrix.os == 'ubuntu-latest' && matrix.heavydb-from == 'docker' }} run: | - mamba run -n docker docker-compose logs --no-color --tail=10000 -f -t \> heavydb-docker.log + mamba run -n docker docker-compose logs --no-color --tail=10000 -f -t > heavydb-docker.log cat heavydb-docker.log eval-notebooks: From 14bc7f48838755f31e2f75e045d85c140ed00486 Mon Sep 17 00:00:00 2001 From: Guilherme Leobas Date: Mon, 19 Jun 2023 15:28:40 -0300 Subject: [PATCH 5/5] skip test --- rbc/tests/heavydb/test_array.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rbc/tests/heavydb/test_array.py b/rbc/tests/heavydb/test_array.py index 19f6ab19c..c2f73e1dc 100644 --- a/rbc/tests/heavydb/test_array.py +++ b/rbc/tests/heavydb/test_array.py @@ -374,6 +374,7 @@ def array_is_null(size): ('double', 'f8', 'fpext')] +@pytest.mark.skip() @pytest.mark.parametrize("typ, col, suffix", inps, ids=[item[-1] for item in inps]) def test_issue197(heavydb, typ, col, suffix):