Skip to content

Numpy fix #23

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.

Sign up for GitHub

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

Open
OakTree100 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Numpy fix #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d234e
Fix compatibility with numpy>=1.20
OakTree100 Feb 19, 2024
2009d4a
Bump version to 0.2.3 and use numpy 1.24
OakTree100 Feb 19, 2024
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
4 changes: 2 additions & 2 deletions scripts/python/xml2vhdl-ox/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jinja2==2.10
logging==0.4.9.6
lxml==4.3.0
markupsafe==1.1.0
numpy==1.16.0
numpy==1.24
packaging==19.0
pygments==2.3.1
pyparsing==2.3.1
Expand All @@ -25,4 +25,4 @@ snowballstemmer==1.2.1
sphinx==1.8.4
sphinxcontrib-websupport==1.1.0
typing==3.6.6; python_version < '3.5'
urllib3==1.24.1
urllib3==1.24.1
2 changes: 1 addition & 1 deletion scripts/python/xml2vhdl-ox/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

setuptools.setup(
name="xml2vhdl-ox",
version="0.2.2",
version="0.2.3",
author="Department of Physics",
author_email="[email protected]",
description="XML to VHDL Memory-Mapped Generation",
Expand Down
2 changes: 1 addition & 1 deletion scripts/python/xml2vhdl-ox/xml2vhdl/helper/slave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ def compute_decoder_mask(self):
add_num = len(addresses)
logger.info('Addresses are: {add_num}'
.format(add_num=add_num))
baddr = np.zeros((add_num, 32), dtype=np.int)
baddr = np.zeros((add_num, 32), dtype=int)
tree_dict = {}

# building address array
Expand Down
2 changes: 1 addition & 1 deletion scripts/python/xml2vhdl-ox/xml2vhdl/xml2ic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ def get_decoder_mask(address_list):
add_num = len(addresses)
logger.info('Addresses are: {}'
.format(add_num))
baddr = np.zeros((add_num, 32), dtype=np.int)
baddr = np.zeros((add_num, 32), dtype=int)
decode_dict = {}
tree_dict = {}

Expand Down