Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/rbc_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ jobs:
EXPECTED_NUMBA_VERSION: ${{ matrix.numba-version }}
RBC_TESTS_FULL: TRUE
run: |
mamba run -n rbc pytest -sv -r A rbc/tests/ -x -k omnisci
mamba run -n rbc pytest -sv -r A rbc/tests/ -x -k heavyai
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
mamba run -n rbc pytest -sv -r A rbc/tests/ -x -k heavyai
mamba run -n rbc pytest -sv -r A rbc/tests/heavyai/ -x

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, let's leave this change to a follow-up PR when heavydb stuff from tests/test_externals_xyz.py is moved under tests/heavyai. @tupui could you open an issue for this task?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure 👍


- name: Run rbc tests
shell: bash -l {0}
Expand All @@ -236,7 +236,7 @@ jobs:
EXPECTED_NUMBA_VERSION: ${{ matrix.numba-version }}
RBC_TESTS_FULL: TRUE
run: |
mamba run -n rbc pytest -sv -r A rbc/tests/ -x -k omnisci
mamba run -n rbc pytest -sv -r A rbc/tests/ -x -k heavyai

- name: Show Omniscidb conda logs on failure [conda]
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion rbc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Expose a temporary prototype. It will be replaced by proper
# implementation soon.
from .remotejit import RemoteJIT # noqa: F401
from .omniscidb import RemoteOmnisci # noqa: F401
from .heavydb import RemoteHeavyDB # noqa: F401

from ._version import get_versions
__version__ = get_versions()['version']
Expand Down
File renamed without changes.
17 changes: 17 additions & 0 deletions rbc/heavyai/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from .array import * # noqa: F401, F403
from .column import * # noqa: F401, F403
from .bytes import * # noqa: F401, F403
from .metatype import * # noqa: F401, F403
from .text_encoding import * # noqa: F401, F403
from .pipeline import * # noqa: F401, F403
from .column_list import * # noqa: F401, F403
from .table_function_manager import * # noqa: F401, F403

from . import mathimpl as math # noqa: F401
from . import npyimpl as np # noqa: F401
from . import python_operators as operators # noqa: F401

# initialize the array api
from rbc.stdlib import array_api # noqa: F401

__all__ = [s for s in dir() if not s.startswith('_')]
6 changes: 3 additions & 3 deletions rbc/omnisci_backend/omnisci_array.py → rbc/heavyai/array.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
__all__ = ['ArrayPointer', 'Array', 'OmnisciArrayType']

from rbc import typesystem, errors
from .omnisci_buffer import (BufferPointer, Buffer,
OmnisciBufferType,
omnisci_buffer_constructor)
from .buffer import (BufferPointer, Buffer,
OmnisciBufferType,
omnisci_buffer_constructor)
from numba.core import extending, types
from typing import Union, TypeVar

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import operator
from collections import defaultdict
from .omnisci_metatype import OmnisciMetaType
from .metatype import OmnisciMetaType
from llvmlite import ir
import numpy as np
from rbc import typesystem, irutils
Expand Down Expand Up @@ -195,7 +195,7 @@ def omnisci_buffer_constructor(context, builder, sig, args):
alloc_fn = irutils.get_or_insert_function(builder.module, alloc_fnty, alloc_fn_name)
ptr8 = builder.call(alloc_fn, [element_count, element_size])
# remember possible temporary allocations so that when leaving a
# UDF/UDTF, these will be deallocated, see omnisci_pipeline.py.
# UDF/UDTF, these will be deallocated, see pipeline.py.
builder_buffers[builder].append(ptr8)
ptr = builder.bitcast(ptr8, context.get_value_type(ptr_type))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
__all__ = ['BytesPointer', 'Bytes', 'OmnisciBytesType']

from rbc import typesystem
from .omnisci_buffer import (
from .buffer import (
BufferPointer, Buffer, OmnisciBufferType,
omnisci_buffer_constructor)
from numba.core import types, extending
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

from llvmlite import ir
from rbc import typesystem, irutils
from .omnisci_buffer import Buffer, OmnisciBufferType, BufferType
from .omnisci_column_list import OmnisciColumnListType
from .buffer import Buffer, OmnisciBufferType, BufferType
from .column_list import OmnisciColumnListType
from rbc.targetinfo import TargetInfo
from numba.core import extending, types

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import operator

from rbc.errors import NumbaTypeError
from .omnisci_buffer import BufferMeta, free_all_other_buffers
from .buffer import BufferMeta, free_all_other_buffers
from numba.core import ir, types
from numba.core.compiler import CompilerBase, DefaultPassBuilder
from numba.core.compiler_machinery import FunctionPass, register_pass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import operator
from llvmlite import ir
from .omnisci_array import ArrayPointer, Array
from .array import ArrayPointer, Array
from rbc import typesystem
from numba.core import extending, types

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

__all__ = ['OmnisciTextEncodingDictType', 'TextEncodingDict']

from .omnisci_metatype import OmnisciMetaType
from .metatype import OmnisciMetaType
from rbc import typesystem


Expand Down
Loading