Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit 8249bbc

Browse files
densmirndensmirn
authored
Merge master to feature/dataframe_model_refactoring (#869)
1 parent 46c1212 commit 8249bbc

45 files changed

Lines changed: 1762 additions & 250 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Building on Linux with conda-build
7474
source activate conda-build-env
7575
git clone https://github.com/IntelPython/sdc.git
7676
cd sdc
77-
conda build --python $PYVER --numpy $NUMPYVER --output-folder=<output_folder> -c intel/label/beta -c defaults -c intel -c conda-forge --override-channels buildscripts/sdc-conda-recipe
77+
conda build --python $PYVER --numpy $NUMPYVER --output-folder=<output_folder> -c intel/label/beta -c defaults -c intel -c conda-forge --override-channels conda-recipe
7878

7979
Building on Linux with setuptools
8080
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -112,7 +112,7 @@ Building on Windows with conda-build
112112
conda activate conda-build-env
113113
git clone https://github.com/IntelPython/sdc.git
114114
cd sdc
115-
conda build --python %PYVER% --numpy %NUMPYVER% --output-folder=<output_folder> -c intel/label/beta -c defaults -c intel -c conda-forge --override-channels buildscripts\sdc-conda-recipe
115+
conda build --python %PYVER% --numpy %NUMPYVER% --output-folder=<output_folder> -c intel/label/beta -c defaults -c intel -c conda-forge --override-channels conda-recipe
116116

117117
Building on Windows with setuptools
118118
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎buildscripts/azure/template-linux-macos.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@ jobs:
3232
displayName: 'Test Intel SDC conda package'
3333
continueOnError: ${{ parameters.allowFailure }}
3434
35-
# TODO: unskip when new DataFrame structure is ready
36-
# - script: |
37-
# source $HOME/miniconda3/bin/activate
38-
# python buildscripts/run_examples.py --python=$PYTHON_VER --sdc-channel=./sdc-build
39-
# displayName: 'Run Intel SDC examples'
40-
# continueOnError: ${{ parameters.allowFailure }}
35+
- script: |
36+
source $HOME/miniconda3/bin/activate
37+
python buildscripts/run_examples.py --python=$PYTHON_VER --sdc-channel=./sdc-build
38+
displayName: 'Run Intel SDC examples'
39+
continueOnError: ${{ parameters.allowFailure }}
4140
4241
- script: |
4342
source $HOME/miniconda3/bin/activate

‎buildscripts/azure/template-windows.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ jobs:
3131
displayName: 'Test Intel SDC conda package'
3232
continueOnError: ${{ parameters.allowFailure }}
3333
34-
# TODO: unskip when new DataFrame structure is ready
35-
# - script: |
36-
# call C:\\Miniconda\\Scripts\activate.bat
37-
# python buildscripts\\run_examples.py --python=%PYTHON_VER% --sdc-channel=.\\sdc-build
38-
# displayName: 'Run Intel SDC examples'
39-
# continueOnError: ${{ parameters.allowFailure }}
34+
- script: |
35+
call C:\\Miniconda\\Scripts\activate.bat
36+
python buildscripts\\run_examples.py --python=%PYTHON_VER% --sdc-channel=.\\sdc-build
37+
displayName: 'Run Intel SDC examples'
38+
continueOnError: ${{ parameters.allowFailure }}

‎buildscripts/utilities.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, python, sdc_local_channel=None):
4646
self.env_name = 'sdc_env'
4747
self.python = python
4848
self.output_folder = self.src_path / 'sdc-build'
49-
self.recipe = self.src_path / 'buildscripts' / 'sdc-conda-recipe'
49+
self.recipe = self.src_path / 'conda-recipe'
5050

5151
self.line_double = '='*80
5252
self.line_single = '-'*80

buildscripts/sdc-conda-recipe/bld.bat renamed to conda-recipe/bld.bat

File renamed without changes.

buildscripts/sdc-conda-recipe/build.sh renamed to conda-recipe/build.sh

File renamed without changes.

buildscripts/sdc-conda-recipe/conda_build_config.yaml renamed to conda-recipe/conda_build_config.yaml

File renamed without changes.

buildscripts/sdc-conda-recipe/meta.yaml renamed to conda-recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package:
77
version: {{ GIT_DESCRIBE_TAG }}
88

99
source:
10-
path: ../..
10+
path: ../
1111

1212
build:
1313
number: {{ GIT_DESCRIBE_NUMBER|int }}
@@ -32,7 +32,7 @@ requirements:
3232

3333
run:
3434
- python
35-
- {{ pin_compatible('numpy') }}
35+
- numpy
3636
- pandas {{ PANDAS_VERSION }}
3737
- pyarrow {{ PYARROW_VERSION }}
3838
- numba {{ NUMBA_VERSION }}

‎conda-recipe/run_test.bat‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
echo on
2+
3+
set NUMBA_DEVELOPER_MODE=1
4+
set NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1
5+
set PYTHONFAULTHANDLER=1
6+
7+
python -m sdc.tests.gen_test_data
8+
if errorlevel 1 exit 1
9+
10+
@rem TODO investigate root cause of NumbaPerformanceWarning
11+
@rem http://numba.pydata.org/numba-doc/latest/user/parallel.html#diagnostics
12+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_basic
13+
if errorlevel 1 exit 1
14+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_series
15+
if errorlevel 1 exit 1
16+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_dataframe
17+
if errorlevel 1 exit 1
18+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_hiframes
19+
if errorlevel 1 exit 1
20+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_date
21+
if errorlevel 1 exit 1
22+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_strings
23+
if errorlevel 1 exit 1
24+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_groupby
25+
if errorlevel 1 exit 1
26+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_join
27+
if errorlevel 1 exit 1
28+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_rolling
29+
if errorlevel 1 exit 1
30+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_ml
31+
if errorlevel 1 exit 1
32+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_io
33+
if errorlevel 1 exit 1
34+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_hpat_jit
35+
if errorlevel 1 exit 1
36+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_sdc_numpy
37+
if errorlevel 1 exit 1
38+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_prange_utils
39+
if errorlevel 1 exit 1
40+
41+
REM Link check for Documentation using Sphinx's in-built linkchecker
42+
REM sphinx-build -b linkcheck -j1 usersource _build/html
43+
REM if errorlevel 1 exit 1

‎conda-recipe/run_test.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
export NUMBA_DEVELOPER_MODE=1
6+
export NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1
7+
export PYTHONFAULTHANDLER=1
8+
9+
python -m sdc.tests.gen_test_data
10+
11+
#Link check for Documentation using Sphinx's in-built linkchecker
12+
#sphinx-build -b linkcheck -j1 usersource _build/html
13+
14+
# TODO investigate root cause of NumbaPerformanceWarning
15+
# http://numba.pydata.org/numba-doc/latest/user/parallel.html#diagnostics
16+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_basic
17+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_series
18+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_dataframe
19+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_hiframes
20+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_date
21+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_strings
22+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_groupby
23+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_join
24+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_rolling
25+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_ml
26+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_io
27+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_hpat_jit
28+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_sdc_numpy
29+
python -W ignore -u -m sdc.runtests -v sdc.tests.test_prange_utils

0 commit comments

Comments
 (0)