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

Commit 8c0914a

Browse files
Merge pull request #921 from IntelPython/release_0.35.0
Release 0.35.0 merge to master
2 parents ec9e100 + c86773a commit 8c0914a

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

conda-recipe/meta.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ outputs:
6464

6565
about:
6666
home: https://github.com/IntelPython/sdc
67-
license: BSD
67+
license: BSD-2-Clause
6868
license_file: LICENSE.md
6969
summary: A compiler-based big data framework in Python
70+
description: |
71+
<strong>LEGAL NOTICE: Use of this software package is subject to the
72+
software license agreement (as set forth above, in the license section of
73+
the installed Conda package and/or the README file) and all notices,
74+
disclaimers or license terms for third party or open source software
75+
included in or with the software.</strong>
76+
<br/><br/>
77+
EULA: <a href="https://opensource.org/licenses/BSD-2-Clause" target="_blank">BSD-2-Clause</a>
78+
<br/><br/>

sdc/datatypes/categorical/types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def __init__(self, dtype, codes=None):
9393
assert(isinstance(dtype, CategoricalDtypeType))
9494
self.pd_dtype = dtype
9595
self.codes = codes or types.Array(self.pd_dtype.int_type(), ndim=1, layout='C')
96+
self.addrspace = None
9697
# TODO: store dtype for categories values and use it for dtype
9798
super().__init__(name=self.__repr__())
9899

sdc/native/utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ using arena_ptr = std::unique_ptr<tbb::task_arena>;
4646
using tsi_ptr = std::unique_ptr<tbb::task_scheduler_init>;
4747
void ignore_assertion( const char*, int, const char*, const char * ) {}
4848
#elif HAS_TASK_SCHEDULER_HANDLE
49-
using tsh_ptr = tbb::task_scheduler_handle;
49+
using tsh_t = tbb::task_scheduler_handle;
5050
#else
5151
#pragma message("Unsupported version of TBB. Parallel sorting is disabled")
5252
#endif
@@ -56,7 +56,7 @@ struct tbb_context
5656
#if HAS_TASK_SCHEDULER_INIT
5757
tsi_ptr tsi;
5858
#elif HAS_TASK_SCHEDULER_HANDLE
59-
tsh tsh;
59+
tsh_t tsh;
6060
#else
6161
#pragma message("Unsupported version of TBB. Parallel sorting is disabled")
6262
#endif

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def check_file_at_path(path2file):
110110

111111
ind = [PREFIX_DIR + '/include', ]
112112
lid = [PREFIX_DIR + '/lib', ]
113-
eca = ['-std=c++11', "-O3"] # '-g', '-O0']
113+
eca = ['-std=c++11', "-O3", "-DTBB_PREVIEW_WAITING_FOR_WORKERS=1"] # '-g', '-O0']
114114
ela = ['-std=c++11', ]
115115

116116
io_libs = []

0 commit comments

Comments
 (0)