wheels: fix missing yosys-abc/share directory #4643
Merged
Conversation
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
donn
changed the title
* `misc/__init__.py`: * checks if there's a `yosys-abc` in the same directory - if yes, sets the variable `sys._pyosys_abc` * checks if there's a `share` in the same directory - if yes, sets the variable `sys._pyosys_share_dirname` * `yosys.cc::init_share_dirname`: check for `sys._pyosys_share_dirname`, use it at the highest priority if Python is enabled * `yosys.cc::init_abc_executable_name`: check for `sys._pyosys_abc`, use it at at the highest priority if Python is enabled * `Makefile`: add new target, `share`, to only create the extra targets * `setup.py`: compile libyosys.so, yosys-abc and share, and copy them all as part of the pyosys build * `test/arch/ecp5/add_sub.py`: ported `add_sub.ys` to Python to act as a test for the share directory and abc with Python wheels, used in CI
mmicko
approved these changes
Oct 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What are the reasons/motivation for this change?
Due to an oversight on my part, #4534 does not copy either
yosys-abcor thesharedirectory. While Yosys technically still runs, it is unusable for anything non-trivial.Explain how this is achieved.
misc/__init__.py:yosys-abcin the same directory - if yes, sets the variablesys._pyosys_abcsharein the same directory - if yes, sets the variablesys._pyosys_share_dirnameyosys.cc::init_share_dirname: check forsys._pyosys_share_dirnameat the highest priority if Python is enabledyosys.cc::init_abc_executable_name: check forsys._pyosys_abc, use it at at the highest priority if Python is enabledMakefile: add new target,share, to only create the extra targetssetup.py: compile libyosys.so, yosys-abc and share, and copy them all as part of the pyosys buildtest/arch/ecp5/add_sub.py: portedadd_sub.ysto Python to act as a test for the share directory and abc with Python wheels, used in CIIf applicable, please suggest to reviewers how they can test the change.