Skip to content

Commit

Permalink
Merge branch 'trunk' into sby
Browse files Browse the repository at this point in the history
  • Loading branch information
unlsycn committed Dec 17, 2024
2 parents ff3db48 + f2ca622 commit 8664251
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions circt-windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@ RUN setx /M PATH "%PATH%;C:\Program Files\Git\bin"
# Download and install python versions.
ADD https://www.python.org/ftp/python/3.12.0/python-3.12.0-amd64.exe C:\TEMP\python312-install.exe
RUN C:\TEMP\python312-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
RUN ("C:\Program Files\Python312/python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil)
RUN ("C:\Program Files\Python312/python.exe" -m pip install wheel numpy pyyaml pybind11 nanobind==2.4.0 cocotb cocotb-test jinja2 psutil)

ADD https://www.python.org/ftp/python/3.11.6/python-3.11.6-amd64.exe C:\TEMP\python311-install.exe
RUN C:\TEMP\python311-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
RUN ("C:\Program Files\Python311/python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil)
RUN ("C:\Program Files\Python311/python.exe" -m pip install wheel numpy pyyaml pybind11 nanobind==2.4.0 cocotb cocotb-test jinja2 psutil)

ADD https://www.python.org/ftp/python/3.10.8/python-3.10.8-amd64.exe C:\TEMP\python310-install.exe
RUN C:\TEMP\python310-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
RUN ("C:\Program Files\Python310/python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil)
RUN ("C:\Program Files\Python310/python.exe" -m pip install wheel numpy pyyaml pybind11 nanobind==2.4.0 cocotb cocotb-test jinja2 psutil)

ADD https://www.python.org/ftp/python/3.9.13/python-3.9.13-amd64.exe C:\TEMP\python39-install.exe
RUN C:\TEMP\python39-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
RUN ("C:\Program Files\Python39/python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil)
RUN ("C:\Program Files\Python39/python.exe" -m pip install wheel numpy pyyaml pybind11 nanobind==2.4.0 cocotb cocotb-test jinja2 psutil)

ADD https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe C:\TEMP\python38-install.exe
RUN C:\TEMP\python38-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
RUN ("C:\Program Files\Python38\python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil)
RUN ("C:\Program Files\Python38\python.exe" -m pip install wheel numpy pyyaml pybind11 nanobind==2.4.0 cocotb cocotb-test jinja2 psutil)

ADD https://www.python.org/ftp/python/3.7.9/python-3.7.9-amd64.exe C:\TEMP\python37-install.exe
RUN C:\TEMP\python37-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
RUN ("C:\Program Files\Python37\python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil)
RUN ("C:\Program Files\Python37\python.exe" -m pip install wheel numpy pyyaml pybind11 nanobind==2.4.0 cocotb cocotb-test jinja2 psutil)

# Get latest version of cmake
ADD https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-windows-x86_64.msi C:\TEMP\cmake.msi
Expand Down
4 changes: 2 additions & 2 deletions integration-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y \
python3.8-dev python3-pip python3.9-dev

RUN python3.8 -m pip install pycapnp psutil pybind11==2.11.2 numpy jinja2 cocotb cocotb_test click
RUN python3.9 -m pip install pycapnp psutil pybind11==2.11.2 numpy jinja2 cocotb cocotb_test click
RUN python3.8 -m pip install pycapnp psutil pybind11==2.11.2 nanobind==2.4.0 numpy jinja2 cocotb cocotb_test click
RUN python3.9 -m pip install pycapnp psutil pybind11==2.11.2 nanobind==2.4.0 numpy jinja2 cocotb cocotb_test click

RUN apt-get update && apt-get install -y tcl

Expand Down

0 comments on commit 8664251

Please sign in to comment.