-
Notifications
You must be signed in to change notification settings - Fork 262
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
feat(ci): support building python on windows #1885
Merged
Merged
Changes from all commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
f928890
feat(ci): support building python on windows
An-DJ 375f5d7
Merge remote-tracking branch 'upstream/main' into python-win-build
An-DJ 2647e8e
Empty-Commit
An-DJ 939a37e
Empty-Commit
An-DJ 3ee5666
fix(ci): use (git) bash to run python steps on Windows
An-DJ 8085249
fix(ci): add conda/bin to Windows system path
An-DJ 5e9a753
remove conda/bin from python ci windows runner
An-DJ eb6af9a
fix(cpp): add missing header
An-DJ 0637214
fix(cpp): rename FuryLogLevel::ERROR to FuryLogLevel::ERR
An-DJ 8efdc83
fix(python): rename pyx built dynamic lib name to '*.pyd'
An-DJ 5ec5b12
fix(python): rename .so to .pyd on windows
An-DJ 4d15089
fix(misc): add *.pyd to .gitignore
An-DJ fa649b9
fix wrong shell syntax
An-DJ f14f0f4
fix wrong shell syntax
An-DJ 64b91bb
fix wrong shell syntax
An-DJ 6582f9c
revert
An-DJ 0bc925b
Merge remote-tracking branch 'upstream/main' into python-win-build
An-DJ 40846ce
fix(ci): use different dtypes on Windows and *nix
An-DJ 3778e0d
fix wrong variable name
An-DJ 508a262
make lint happy
An-DJ 7e64bde
fix bazel install error on windows
An-DJ 9b2e9be
use bazelisk to manage bazel version
An-DJ cd6c554
skip install bazel manually on windows
An-DJ b8e4990
replace manual install with official bazel action
An-DJ f0dcf77
simplify serialize.py
An-DJ b3adbca
fix wrong bazel version on Windows
An-DJ 9ab1b8c
Force to install old version bazel
An-DJ 8547912
make lint happy
An-DJ 1f57495
add numpy memoryview test
An-DJ aa104dc
fix wrong test
An-DJ 7785cd2
fix missing import
An-DJ f97a643
fix wrong ci
An-DJ 687b02e
remove useless dot file
An-DJ c11d467
Update python/pyfury/_util.pyx
chaokunyang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
6.3.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
**/*.cpp | ||
**/*.so | ||
**/*.dylib | ||
**/*.pyd | ||
bazel-* | ||
.whl | ||
python/.cache | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,7 +35,7 @@ enum class FuryLogLevel { | |
DEBUG = -1, | ||
INFO = 0, | ||
WARNING = 1, | ||
ERROR = 2, | ||
ERR = 2, | ||
FATAL = 3 | ||
}; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you attach the error message/log you face about the original
ERROR
identifier?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm it seems here: https://github.com/apache/fury/actions/runs/11643078405/job/32423399925#step:5:1894
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just took a glance, and I think that maybe the Cython generated code defines a macro named
ERROR
and it's included before this header so that weird thing happens. Not familiar with related code here, maybe @penguin-wwy has ideas about this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
from chatgpt:
MSVC and Macros: The MSVC environment automatically defines some macros that can interfere with your code. One such macro is ERROR, which is commonly defined within Windows headers or other libraries. When you use ERROR as a name for an enumeration or variable in your code, it collides with this pre-existing macro definition, causing syntax errors.
We can use ERR here, for better compatibility, maybe we should define the enum value with FURY prefix:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea. Restyle it in #2016 . : )