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

[pull] main from PriorLabs:main #59

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
e4865bd
xfail instead of fail for one sklearn test
LeoGrin Jan 16, 2025
587bea7
add minimum and maximum (current) version for our package
LeoGrin Jan 16, 2025
afe8025
add CI and dependabot
LeoGrin Jan 16, 2025
e39ec66
add miniumum versions even when very old to help the parsing in the ci
LeoGrin Jan 16, 2025
ea33ed5
accept python3.12
LeoGrin Jan 16, 2025
3ef122d
apply precommit
LeoGrin Jan 16, 2025
55aefe5
update ruff version to match precommit config
LeoGrin Jan 16, 2025
4bb2abf
no ruff on examples
LeoGrin Jan 16, 2025
221e34e
fix requirement install in ci
LeoGrin Jan 16, 2025
9e0dc05
fix requirement install in ci
LeoGrin Jan 16, 2025
54b757e
use uv
LeoGrin Jan 21, 2025
a23800e
fix ci test for macos13
LeoGrin Jan 21, 2025
528ae4c
test fix
LeoGrin Jan 21, 2025
f269f73
test fix
LeoGrin Jan 21, 2025
5a7271c
make max versions more lax
LeoGrin Jan 21, 2025
72f6405
fix github action
LeoGrin Jan 21, 2025
7529757
Merge pull request #141 from PriorLabs/improve_dependencies_versionin…
LeoGrin Jan 21, 2025
1802f0b
support PreprocessorConfig being dict in input
LeoGrin Jan 21, 2025
287b33e
check that the result is the same with dict input or PreprocessorConf…
LeoGrin Jan 21, 2025
991cd0b
run precommit
LeoGrin Jan 21, 2025
b995795
add docstring
LeoGrin Jan 21, 2025
c895961
Merge pull request #148 from PriorLabs/accept_dict_as_preprocessor_co…
LeoGrin Jan 21, 2025
3f97bfe
fix: make fingerprint feature deterministic
LennartPurucker Jan 22, 2025
aadaf75
Merge pull request #151 from PriorLabs/fix_fp_feature
LennartPurucker Jan 22, 2025
83e0518
Update README.md
LennartPurucker Jan 24, 2025
c97a2a3
Merge pull request #156 from PriorLabs/add_paper_to_readme
LennartPurucker Jan 24, 2025
d52fb64
Add Python 3.12 PyPi tag
Innixma Jan 24, 2025
76b004a
Add supported python versions badge to Readme
Innixma Jan 24, 2025
58875f0
Merge pull request #160 from Innixma/patch-2
noahho Jan 25, 2025
848d717
Merge pull request #159 from Innixma/patch-1
noahho Jan 25, 2025
c79369c
Update README.md
noahho Jan 28, 2025
38cd135
Update README.md
noahho Jan 28, 2025
16130af
Update README.md
noahho Jan 28, 2025
84c0af4
Update README.md
noahho Jan 29, 2025
3d63bac
xfail on check_methods_sample_order_invariance too
AlexanderPfefferle Jan 31, 2025
cd4dc78
bump version + add __version__ attribute
LeoGrin Jan 31, 2025
dd69809
use custom nanmean and nansum
AlexanderPfefferle Jan 31, 2025
e19741e
replaced torch.Generator with isolated rng
AlexanderPfefferle Jan 31, 2025
cb487ed
Rename LICENSE.txt to LICENSE
noahho Feb 2, 2025
bdd2d29
bugfix
AlexanderPfefferle Feb 4, 2025
2a22cb2
speedup feature selection
LeoGrin Feb 4, 2025
6f9ce90
ruff
LeoGrin Feb 4, 2025
41a5df7
ruff
LeoGrin Feb 4, 2025
f1af310
ruff
LeoGrin Feb 4, 2025
3a5e033
add doc
LeoGrin Feb 4, 2025
dbfc9ea
ruff
LeoGrin Feb 4, 2025
4c79b45
fix calculating E[x2] in FullSupportBarDistribution
Feb 5, 2025
cc7fdec
add tabpfn.show_versions() + issue template
LeoGrin Feb 5, 2025
e5c9fd7
ruff
LeoGrin Feb 5, 2025
c8d04be
ruff
LeoGrin Feb 5, 2025
7e91976
Merge pull request #170 from iivalchev/main
LeoGrin Feb 5, 2025
4b8b18a
Merge pull request #168 from PriorLabs/speedup_feature_select
LeoGrin Feb 5, 2025
0feb3c4
add back prints
LeoGrin Feb 5, 2025
c0d8535
rename show_versions
LeoGrin Feb 5, 2025
d733545
update issue template
LeoGrin Feb 5, 2025
28e7cae
Merge pull request #172 from PriorLabs/issue_template
LeoGrin Feb 5, 2025
3d0647f
add feature request issue template
LeoGrin Feb 5, 2025
50bba69
added test_onnx_exportable_cpu
AlexanderPfefferle Feb 5, 2025
591a73b
added onnx to dev dependencies
AlexanderPfefferle Feb 6, 2025
dd10623
add onnx dependency to the ci
LeoGrin Feb 6, 2025
41e3602
make tests deterministic
LeoGrin Feb 6, 2025
133e5ab
make unstable test pass for older scipy
LeoGrin Feb 7, 2025
634efcd
Merge pull request #165 from AlexanderPfefferle/onnx_exportable
LeoGrin Feb 7, 2025
d24577f
Add get_embeddings to estimators
KulikDM Feb 10, 2025
b4cf4a0
use sklearn-compat package to work across sklearn versions
LeoGrin Feb 11, 2025
54788c1
vendor the sklearn-compat package and create a new misc folder
LeoGrin Feb 11, 2025
d1081c5
tweak
LeoGrin Feb 11, 2025
9f208b7
Merge pull request #180 from PriorLabs/remove_sklearn_warnings
LeoGrin Feb 11, 2025
9b12c14
Return standard out embeddings arg
KulikDM Feb 11, 2025
bcbac37
Add data_source arg to get_embeddings
KulikDM Feb 12, 2025
214ff49
Merge branch 'main' into Embeddings-V2
noahho Feb 12, 2025
990f188
Fix import issue in get_embeddings test
KulikDM Feb 12, 2025
4624dbe
Implement get_total_memory for windows
mert-kurttutan Feb 13, 2025
093054e
Make sure to run on windows
mert-kurttutan Feb 13, 2025
0843d54
Add tests for new total memory for windows
mert-kurttutan Feb 13, 2025
475a3e9
Move memorystatus class inside, more comments
mert-kurttutan Feb 13, 2025
531f38c
Fix ruff formatting
mert-kurttutan Feb 13, 2025
fff1553
Removed random_state arg from get_embeddings test
KulikDM Feb 13, 2025
39e4d72
Add windows to test worflow OSes
mert-kurttutan Feb 13, 2025
ac2ae00
Use python scripts to get max/min deps
mert-kurttutan Feb 14, 2025
b1183ab
Remove a silly debugging line from scripts
mert-kurttutan Feb 14, 2025
b0fe278
Add psutil to deps in CI
mert-kurttutan Feb 14, 2025
5cb459a
Fix CI: (Bug on ONNX's side)
mert-kurttutan Feb 14, 2025
a5139bc
Lint embeddings addition
KulikDM Feb 14, 2025
e2b402d
Dont run onnx tests on windows
mert-kurttutan Feb 14, 2025
b953e87
Merge pull request #178 from KulikDM/Embeddings-V2
noahho Feb 16, 2025
b0bc461
Merge pull request #184 from mert-kurttutan/main
noahho Feb 16, 2025
904402f
Update README.md
noahho Feb 19, 2025
d048462
Update README.md
noahho Feb 19, 2025
4c50e8d
Update README.md
noahho Feb 19, 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
Prev Previous commit
Next Next commit
Move memorystatus class inside, more comments
- Moving inside since it is used only for that function
  • Loading branch information
mert-kurttutan committed Feb 13, 2025
commit 475a3e99cdab7017faef228dc2680b2ef63fefcb
31 changes: 17 additions & 14 deletions src/tabpfn/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -790,20 +790,7 @@ def _transform_borders_one(
return logit_cancel_mask, descending_borders, borders_t


# ref: https://github.com/microsoft/windows-rs/blob/c9177f7a65c764c237a9aebbd3803de683bedaab/crates/tests/bindgen/src/fn_return_void_sys.rs#L12
# ref: https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
class _MEMORYSTATUSEX(ctypes.Structure):
_fields_: typing.ClassVar = [
("dwLength", ctypes.c_ulong),
("dwMemoryLoad", ctypes.c_ulong),
("ullTotalPhys", ctypes.c_ulonglong),
("ullAvailPhys", ctypes.c_ulonglong),
("ullTotalPageFile", ctypes.c_ulonglong),
("ullAvailPageFile", ctypes.c_ulonglong),
("ullTotalVirtual", ctypes.c_ulonglong),
("ullAvailVirtual", ctypes.c_ulonglong),
("ullAvailExtendedVirtual", ctypes.c_ulonglong),
]



# Terminology: Use memory to referent physical memory, swap for swap memory
Expand All @@ -813,6 +800,22 @@ def get_total_memory_windows() -> float:
Returns:
The total memory of the system in GB.
"""
# ref: https://github.com/microsoft/windows-rs/blob/c9177f7a65c764c237a9aebbd3803de683bedaab/crates/tests/bindgen/src/fn_return_void_sys.rs#L12
# ref: https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
# this class is needed to load the memory status with GlobalMemoryStatusEx function using win32 API,
# for more details see microsoft docs link above
class _MEMORYSTATUSEX(ctypes.Structure):
_fields_: typing.ClassVar = [
("dwLength", ctypes.c_ulong),
("dwMemoryLoad", ctypes.c_ulong),
("ullTotalPhys", ctypes.c_ulonglong),
("ullAvailPhys", ctypes.c_ulonglong),
("ullTotalPageFile", ctypes.c_ulonglong),
("ullAvailPageFile", ctypes.c_ulonglong),
("ullTotalVirtual", ctypes.c_ulonglong),
("ullAvailVirtual", ctypes.c_ulonglong),
("ullAvailExtendedVirtual", ctypes.c_ulonglong),
]
# Initialize the structure
mem_status = _MEMORYSTATUSEX()
# need to initialize lenght of structure, see microsft docs above
Expand Down