Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[enhancement] add dlpack support to to_table #2275

Open
wants to merge 142 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
939141e
start from #2195
icfaust Jan 27, 2025
ae038cc
add apache license
icfaust Jan 27, 2025
df87e74
add files from #1568
icfaust Jan 27, 2025
a6d364b
start converting over
icfaust Jan 27, 2025
eabbbed
attempts to fix copyright checker
icfaust Jan 27, 2025
bf459de
remove table_metadata
icfaust Jan 27, 2025
941a8ad
Merge branch 'uxlfoundation:main' into dev/dlpack_integration
icfaust Jan 27, 2025
ce6de53
merge
icfaust Jan 27, 2025
4caedc7
weird merge
icfaust Jan 27, 2025
009a19c
renaming
icfaust Jan 27, 2025
ccc3534
change location
icfaust Jan 27, 2025
3a6c3db
will implement these elsewhere
icfaust Jan 27, 2025
7c36c57
move files to follow naming
icfaust Jan 27, 2025
79496da
change headers further
icfaust Jan 27, 2025
311e4bf
Merge remote-tracking branch 'sklearnex/main' into dev/dlpack_integra…
icfaust Jan 27, 2025
09b6c7c
Merge branch 'uxlfoundation:main' into dev/dlpack_integration
icfaust Jan 27, 2025
5f92352
interim standpoint which will fail
icfaust Jan 27, 2025
1d1076d
interim changes
icfaust Jan 28, 2025
c4461d5
helper -> utils
icfaust Jan 28, 2025
39243b9
move macro to a central spot
icfaust Jan 28, 2025
05a1c15
remove whitespace
icfaust Jan 28, 2025
559a127
commit before merge
icfaust Jan 28, 2025
ba98166
Merge branch 'main' into dev/dlpack_integration
icfaust Jan 28, 2025
ca88f51
current status
icfaust Jan 28, 2025
db1fe9d
interim
icfaust Jan 28, 2025
9b318d0
remove and format
icfaust Jan 28, 2025
5da5f41
more fixes
icfaust Jan 28, 2025
827304d
add fixes
icfaust Jan 28, 2025
d69fd2b
add fixes
icfaust Jan 28, 2025
6f63c15
more fixes
icfaust Jan 28, 2025
e980f84
add fixes
icfaust Jan 28, 2025
d649537
more fixes
icfaust Jan 28, 2025
1893516
more fixes
icfaust Jan 28, 2025
99076a4
updates
icfaust Jan 28, 2025
a6a83d3
updates
icfaust Jan 28, 2025
6076ed2
more fixes
icfaust Jan 28, 2025
7e7aa5b
formatting
icfaust Jan 28, 2025
92c3ae3
formatting
icfaust Jan 28, 2025
b5929f8
formatting
icfaust Jan 28, 2025
7c157df
changes
icfaust Jan 28, 2025
1e9ebc4
move header include
icfaust Jan 28, 2025
a9e83f2
fix tensor issue
icfaust Jan 28, 2025
16ea427
type change
icfaust Jan 28, 2025
29f3565
move literals to see if it helps
icfaust Jan 28, 2025
6940536
status
icfaust Jan 28, 2025
6c1a246
remove inline
icfaust Jan 28, 2025
c522ada
move ordering in table.cpp
icfaust Jan 28, 2025
4fd71a6
missing whitespace
icfaust Jan 28, 2025
2da618b
change macro section
icfaust Jan 28, 2025
dcac239
add some commentary
icfaust Jan 28, 2025
698a7cb
attempt to shorten with a macro
icfaust Jan 29, 2025
dc2c13e
first fixes for array_api_strict
icfaust Jan 29, 2025
9db52f7
formatting
icfaust Jan 29, 2025
7c22a2f
remove unneeded code
icfaust Jan 29, 2025
b9dbaa0
remove unneeded code
icfaust Jan 29, 2025
d0c1c40
oops
icfaust Jan 29, 2025
827fefd
make better logic
icfaust Jan 29, 2025
817dfd1
attempt to include byte_offset
icfaust Jan 29, 2025
0ed6ed4
convert to static_cast entirely
icfaust Jan 29, 2025
4a0aa9d
back to reinterpret_cast
icfaust Jan 29, 2025
8720ab1
add initial tests
icfaust Jan 29, 2025
2fa5929
remove array api from contiguous test
icfaust Jan 29, 2025
1c3aca6
hide behind if statement, definite a TODO
icfaust Jan 29, 2025
12a1f56
working on test case failures
icfaust Jan 29, 2025
23d3222
switch to length_error
icfaust Jan 29, 2025
1ee3c19
Update test_data.py
icfaust Jan 29, 2025
61d8044
Update test_data.py
icfaust Jan 29, 2025
065a0e2
Update test_data.py
icfaust Jan 29, 2025
387c7e3
retest with dpnp and dpctl
icfaust Jan 30, 2025
0355103
fix stride counting
icfaust Jan 30, 2025
20db18d
begin testing strategy change
icfaust Jan 30, 2025
80ac3ad
add tests
icfaust Jan 30, 2025
512d8ee
fix mistakes in test
icfaust Jan 30, 2025
c5bde34
move class out of if statement
icfaust Jan 30, 2025
0a7678c
Update test_validation.py
icfaust Jan 30, 2025
80255dd
remove pandas
icfaust Jan 31, 2025
6b318c9
missing change
icfaust Jan 31, 2025
0691f6e
add initial memory leak checking
icfaust Jan 31, 2025
0399e0c
remove get_namespace
icfaust Jan 31, 2025
d77c922
remove dpc backend skip
icfaust Jan 31, 2025
617b322
fix issue in get_namespace change
icfaust Jan 31, 2025
3f6e8c9
further fixes
icfaust Jan 31, 2025
c0d356b
attempt again
icfaust Jan 31, 2025
81cbc51
Merge branch 'uxlfoundation:main' into dev/dlpack_integration
icfaust Feb 2, 2025
826b2a4
address changes
icfaust Feb 3, 2025
25bc110
add recursion block on suggestion
icfaust Feb 4, 2025
3431c7a
Update doc/third-party-programs-sklearnex.txt
icfaust Feb 5, 2025
52af11c
add testing for emptys and simple types
icfaust Feb 5, 2025
60c4cd4
rewrite test
icfaust Feb 5, 2025
7629706
attempt to solve empty and dlpack scalars
icfaust Feb 6, 2025
77bcb09
deal with odd scenario
icfaust Feb 6, 2025
3db0c5b
fix some tests
icfaust Feb 6, 2025
93f52fe
attempt at making things consistent
icfaust Feb 6, 2025
21514f5
oops
icfaust Feb 6, 2025
8c05300
try again
icfaust Feb 6, 2025
b3667ca
try to swap
icfaust Feb 6, 2025
72b146c
Update test_data.py
icfaust Feb 6, 2025
e90ba16
Update dlpack_utils.cpp
icfaust Feb 7, 2025
a372d0a
Update test_data.py
icfaust Feb 7, 2025
a66f852
Update test_data.py
icfaust Feb 7, 2025
aed0904
Update test_data.py
icfaust Feb 7, 2025
c31450e
Update data_conversion.cpp
icfaust Feb 7, 2025
dabf223
Update data_conversion.cpp
icfaust Feb 7, 2025
aab194b
try again
icfaust Feb 7, 2025
e2d2cd3
bad logic correction
icfaust Feb 7, 2025
bbb1ab1
make consistent
icfaust Feb 7, 2025
d821edc
std -> py
icfaust Feb 7, 2025
cd395c8
missing bracket
icfaust Feb 7, 2025
817dceb
additional fixes
icfaust Feb 7, 2025
2cf1339
further homogenation
icfaust Feb 7, 2025
69a9740
try again
icfaust Feb 7, 2025
f9602e4
fix dlpack again
icfaust Feb 7, 2025
49e3bf7
set a ticket up to solve this edge case
icfaust Feb 7, 2025
129797a
Update test_data.py
icfaust Feb 7, 2025
1f61b02
Update test_data.py
icfaust Feb 7, 2025
05b66fc
Update dtype_conversion.cpp
icfaust Feb 7, 2025
524378f
Update data_conversion.cpp
icfaust Feb 7, 2025
f88be42
Update data_conversion.cpp
icfaust Feb 7, 2025
b661373
Update data_conversion.cpp
icfaust Feb 7, 2025
d1a88b3
Update dtype_conversion.cpp
icfaust Feb 7, 2025
376d125
Update data_conversion.cpp
icfaust Feb 7, 2025
48753d7
Update test_data.py
icfaust Feb 7, 2025
01ae64a
Update test_data.py
icfaust Feb 7, 2025
0655382
Update test_data.py
icfaust Feb 8, 2025
32cef43
Update onedal/datatypes/dlpack/dlpack_utils.cpp
icfaust Feb 18, 2025
6f92764
Update onedal/datatypes/dlpack/data_conversion.cpp
icfaust Feb 18, 2025
7062b0b
Update onedal/datatypes/sycl_usm/dtype_conversion.cpp
icfaust Feb 18, 2025
6d47241
Update test_data.py
icfaust Feb 18, 2025
de8bfb0
Update test_data.py
icfaust Feb 18, 2025
aacb86e
Update test_data.py
icfaust Feb 18, 2025
4eb1817
Update test_data.py
icfaust Feb 18, 2025
52db1fc
Update dlpack_utils.cpp
icfaust Feb 19, 2025
938d545
Update dlpack_utils.cpp
icfaust Feb 19, 2025
d3a94f8
Update data_conversion.cpp
icfaust Feb 19, 2025
a468aad
Update data_conversion.cpp
icfaust Feb 19, 2025
01e419b
Update data_conversion.cpp
icfaust Feb 19, 2025
754728e
Update data_conversion.cpp
icfaust Feb 19, 2025
159fba3
clang formatting
icfaust Feb 19, 2025
173d98b
fight segfault with dpctl
icfaust Feb 20, 2025
7f01aea
Update data_conversion.cpp
icfaust Feb 20, 2025
c102f57
formatting
icfaust Feb 20, 2025
164f90c
Update test_data.py
icfaust Feb 20, 2025
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
3 changes: 2 additions & 1 deletion .github/.licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ header:
# Specific files
- 'setup.cfg'
- 'LICENSE'

# External copies of copyrighted work
- 'onedal/datatypes/dlpack/dlpack.h'
comment: never

license-location-threshold: 80 # specifies the index threshold where the license header can be located.
207 changes: 206 additions & 1 deletion doc/third-party-programs-sklearnex.txt
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ DAMAGE.
-------------------------------------------------------------

3. Cython
Apache License
Apache License
Version 2.0, January 2004
https://www.apache.org/licenses/

Expand Down Expand Up @@ -421,4 +421,209 @@ Apache License

-------------------------------------------------------------

4. DLPack
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2017 by Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

-------------------------------------------------------------

Other names and brands may be claimed as the property of others.
Loading
Loading