Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.
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
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions sdc/native/utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down
10 changes: 5 additions & 5 deletions sdc/tests/gen_test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion sdc/transport/hpat_transport_single_process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <Windows.h>

// 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);

Expand Down