From 5d20ef12a5f098c6dabd7aa30b63f89a340d4b8f Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 3 Jun 2020 16:48:28 +0000 Subject: [PATCH 1/4] SAT-2941 - SDC: Function tests failed for all platforms Commented parquet usage in test data generation. --- sdc/tests/gen_test_data.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdc/tests/gen_test_data.py b/sdc/tests/gen_test_data.py index ef37d224c..fa5fbba0b 100644 --- a/sdc/tests/gen_test_data.py +++ b/sdc/tests/gen_test_data.py @@ -27,7 +27,7 @@ import os import numpy as np import pyarrow as pa -import pyarrow.parquet as pq +# import pyarrow.parquet as pq import pandas as pd @@ -158,8 +158,8 @@ def generate_other_data(): if __name__ == "__main__": print(f'generation phase in {os.getcwd()}') - ParquetGenerator.gen_kde_pq() - ParquetGenerator.gen_pq_test() - generate_spark_data() + # ParquetGenerator.gen_kde_pq() + # ParquetGenerator.gen_pq_test() + # generate_spark_data() generate_csv_data() - generate_other_data() + # generate_other_data() From 96979afc6beaa95ab44eb43206cc8b2fda94d20f Mon Sep 17 00:00:00 2001 From: Alexander Kalistratov Date: Wed, 3 Jun 2020 21:23:03 +0300 Subject: [PATCH 2/4] Update README with tbb information (#872) --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index b1d4c4087..d4c53b4ba 100644 --- a/README.rst +++ b/README.rst @@ -80,9 +80,9 @@ Building on Linux with setuptools ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ :: - PYVER=<3.6 or 3.7> - NUMPYVER=<1.16 or 1.17> - conda create -n sdc-env -q -y -c intel/label/beta -c defaults -c intel -c conda-forge python=$PYVER numpy=$NUMPYVER numba=0.49 pandas=0.25.3 pyarrow=0.17.0 gcc_linux-64 gxx_linux-64 + export PYVER=<3.6 or 3.7> + export NUMPYVER=<1.16 or 1.17> + conda create -n sdc-env -q -y -c intel/label/beta -c defaults -c intel -c conda-forge python=$PYVER numpy=$NUMPYVER tbb-devel tbb4py numba=0.49 pandas=0.25.3 pyarrow=0.17.0 gcc_linux-64 gxx_linux-64 source activate sdc-env git clone https://github.com/IntelPython/sdc.git cd sdc @@ -120,7 +120,7 @@ Building on Windows with setuptools set PYVER=<3.6 or 3.7> set NUMPYVER=<1.16 or 1.17> - conda create -n sdc-env -c intel/label/beta -c defaults -c intel -c conda-forge python=%PYVER% numpy=%NUMPYVER% numba=0.49 pandas=0.25.3 pyarrow=0.17.0 + conda create -n sdc-env -c intel/label/beta -c defaults -c intel -c conda-forge python=%PYVER% numpy=%NUMPYVER% tbb-devel tbb4py numba=0.49 pandas=0.25.3 pyarrow=0.17.0 conda activate sdc-env set INCLUDE=%INCLUDE%;%CONDA_PREFIX%\Library\include set LIB=%LIB%;%CONDA_PREFIX%\Library\lib From 737ccefaea16c179614994bba606a2d62acd9322 Mon Sep 17 00:00:00 2001 From: Alexander Kalistratov Date: Wed, 3 Jun 2020 21:36:13 +0300 Subject: [PATCH 3/4] Add default constructor to void_range::iterator (#875) --- sdc/native/utils.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdc/native/utils.hpp b/sdc/native/utils.hpp index f95bfcd87..540ea8c1a 100644 --- a/sdc/native/utils.hpp +++ b/sdc/native/utils.hpp @@ -110,6 +110,8 @@ struct void_range using pointer = data_type*; using iterator_category = std::random_access_iterator_tag; + iterator() {} + iterator(void* ptr, uint64_t size): _ptr(ptr), _size(size) {} iterator(const iterator& other): _ptr(other._ptr), _size(other._size) {} From b2505d6a5bd9589752490fb1987517388f9b204c Mon Sep 17 00:00:00 2001 From: Alexander Kalistratov Date: Wed, 3 Jun 2020 23:46:17 +0300 Subject: [PATCH 4/4] gettimeofday for Windows with python 3.6 (#873) --- sdc/transport/hpat_transport_single_process.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdc/transport/hpat_transport_single_process.cpp b/sdc/transport/hpat_transport_single_process.cpp index 0cc9ae32b..668990a1c 100644 --- a/sdc/transport/hpat_transport_single_process.cpp +++ b/sdc/transport/hpat_transport_single_process.cpp @@ -35,7 +35,7 @@ #include // no gettimeofday on Win32/Win64 -int gettimeofday(struct timeval* tp, struct timezone* tzp) +int gettimeofday(struct timeval* tp, void* tzp) { static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL);