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

Commit cb733a0

Browse files
Merge pull request #879 from IntelPython/integration/release_0.33.0
Integration/release 0.33.0
2 parents 078fa42 + cbf3d74 commit cb733a0

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ Building on Linux with setuptools
8080
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8181
::
8282

83-
PYVER=<3.6 or 3.7>
84-
NUMPYVER=<1.16 or 1.17>
85-
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
83+
export PYVER=<3.6 or 3.7>
84+
export NUMPYVER=<1.16 or 1.17>
85+
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
8686
source activate sdc-env
8787
git clone https://github.com/IntelPython/sdc.git
8888
cd sdc
@@ -120,7 +120,7 @@ Building on Windows with setuptools
120120

121121
set PYVER=<3.6 or 3.7>
122122
set NUMPYVER=<1.16 or 1.17>
123-
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
123+
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
124124
conda activate sdc-env
125125
set INCLUDE=%INCLUDE%;%CONDA_PREFIX%\Library\include
126126
set LIB=%LIB%;%CONDA_PREFIX%\Library\lib

sdc/native/utils.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ struct void_range
110110
using pointer = data_type*;
111111
using iterator_category = std::random_access_iterator_tag;
112112

113+
iterator() {}
114+
113115
iterator(void* ptr, uint64_t size): _ptr(ptr), _size(size) {}
114116

115117
iterator(const iterator& other): _ptr(other._ptr), _size(other._size) {}

sdc/transport/hpat_transport_single_process.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <Windows.h>
3636

3737
// no gettimeofday on Win32/Win64
38-
int gettimeofday(struct timeval* tp, struct timezone* tzp)
38+
int gettimeofday(struct timeval* tp, void* tzp)
3939
{
4040
static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL);
4141

0 commit comments

Comments
 (0)