Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HeavyAI 6.4.4 and 7.0.0 from docker #564

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions .github/workflows/rbc_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,23 +112,24 @@ jobs:
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
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

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -226,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
Expand Down Expand Up @@ -277,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:
Expand Down
3 changes: 2 additions & 1 deletion .heavyai/heavyai.conf
Original file line number Diff line number Diff line change
@@ -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
license = "/var/lib/heavyai/license.txt"
2 changes: 1 addition & 1 deletion .omnisci/omnisci.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ services:
- 6278:6278
- 6279:6279
volumes:
- ./.omnisci/omnisci.conf:/omnisci-storage/omnisci.conf
- ./.heavyai/heavyai.conf:/var/lib/heavyai/heavy.conf
- ./.heavyai/license.txt:/var/lib/heavyai/license.txt
1 change: 1 addition & 0 deletions rbc/tests/heavydb/test_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion rbc/tests/heavydb/test_geolinestring.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']):
Expand Down
2 changes: 1 addition & 1 deletion rbc/tests/heavydb/test_geomultipolygon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rbc/tests/heavydb/test_geopoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rbc/tests/heavydb/test_geopolygon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down