Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1e9a6db
add dependency for ubuntu 22.04. verified locally.
Tulong4Dev Mar 20, 2023
00db442
update host setup and test setting.
Tulong4Dev Mar 22, 2023
2e976e1
fix ssl failure in cmake and update python version
Tulong4Dev Mar 22, 2023
0119798
update install dependency for ubuntu_22.04.
Tulong4Dev Mar 23, 2023
9913214
change python version to 3.12.0
Tulong4Dev Mar 23, 2023
0554e81
change python to 3.10.10.
Tulong4Dev Mar 23, 2023
3944060
restore host setup and add modules needed.
Tulong4Dev Mar 23, 2023
a08bf75
fix typo.
Tulong4Dev Mar 24, 2023
27dff1c
drop fail-to-install modules.
Tulong4Dev Mar 24, 2023
edf8f09
drop other modules but c compilers only.
Tulong4Dev Mar 27, 2023
516e2fa
udpate ctag, qt, and cmake.
Tulong4Dev Mar 27, 2023
adcb67d
update tcl package.
Tulong4Dev Mar 28, 2023
42b6c32
add back tcllib package
Tulong4Dev Mar 28, 2023
84a4e97
drop clang-6,7,8 and gcc/g++7,8;add clang-format12
Tulong4Dev Mar 28, 2023
88d126f
add libeigen3-dev
Tulong4Dev Mar 28, 2023
b13eae8
add back tcllib.
Tulong4Dev Mar 29, 2023
84ffd42
drop eigen3-dev.
Tulong4Dev Mar 29, 2023
0dfc100
drop latest cmake, add ament-cmake
Tulong4Dev Mar 29, 2023
6919f87
add pkg-config, replace w/ clang-12, libtbb12
Tulong4Dev Mar 29, 2023
238a86c
add clang, clang++; add clang10 for ubuntu focal
Tulong4Dev Mar 29, 2023
55487b0
drop clang, clang++.
Tulong4Dev Mar 30, 2023
7992f03
add back clang, drop clan 10 test, add alorithm header for swap in vt…
Tulong4Dev Mar 30, 2023
676c522
add utility header for std::swap
Tulong4Dev Mar 31, 2023
aa9e3e7
remove adding utility for rr_graph_storage.cpp as it does not help.
Tulong4Dev Apr 3, 2023
11b03da
Merge branch 'master' into ubuntu_22.04_dev
vaughnbetz Apr 4, 2023
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
11 changes: 6 additions & 5 deletions .github/scripts/hostsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ apt install -y \
build-essential \
capnproto \
clang \
ctags \
exuberant-ctags \
curl \
doxygen \
flex \
Expand All @@ -50,20 +50,21 @@ apt install -y \
libxft-dev \
libxml++2.6-dev \
libreadline-dev \
python \
python2 \
python3 \
python3-dev \
python3-pip \
python3-virtualenv \
python3-yaml \
tcl-dev \
tcllib \
tcl8.6-dev \
libffi-dev \
perl \
texinfo \
time \
valgrind \
zip \
qt5-default \
qtbase5-dev \
uuid-dev \
default-jdk \
g++-9 \
Expand All @@ -75,7 +76,7 @@ apt install -y \
apt install -y apt-transport-https ca-certificates gnupg
wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc |apt-key add -

apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
apt update
apt install -y cmake

Expand Down
23 changes: 10 additions & 13 deletions .github/scripts/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ sudo apt install -y \
binutils-gold \
build-essential \
capnproto \
cmake \
ctags \
ament-cmake \
exuberant-ctags \
curl \
doxygen \
flex \
Expand All @@ -31,31 +31,28 @@ sudo apt install -y \
libxft-dev \
libxml++2.6-dev \
libreadline-dev \
tcl-dev \
tcllib \
tcl8.6-dev \
libffi-dev \
perl \
pkg-config \
texinfo \
time \
valgrind \
zip \
qt5-default \
qtbase5-dev \
uuid-dev \
default-jdk \
clang-format-7 \
g++-7 \
gcc-7 \
g++-8 \
gcc-8 \
clang \
clang-format-12 \
g++-9 \
gcc-9 \
g++-10 \
gcc-10 \
g++-11 \
gcc-11 \
clang-6.0 \
clang-7 \
clang-10 \
libtbb-dev
clang-12 \
libtbb12

pip install -r requirements.txt

Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/build_dependency_ubuntu-22.04.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/usr/bin/env bash

# The package list is designed for Ubuntu 20.04 LTS
add-apt-repository -y ppa:ubuntu-toolchain-r/test
apt-get update
apt-get install -y \
autoconf \
automake \
bison \
ccache \
cmake \
exuberant-ctags \
curl \
doxygen \
flex \
fontconfig \
gdb \
git \
gperf \
iverilog \
libc6-dev \
libcairo2-dev \
libevent-dev \
libffi-dev \
libfontconfig1-dev \
liblist-moreutils-perl \
libncurses5-dev \
libreadline-dev \
libreadline8 \
libx11-dev \
libxft-dev \
libxml++2.6-dev \
make \
perl \
pkg-config \
python3 \
python3-setuptools \
python3-lxml \
python3-pip \
qtbase5-dev \
tcllib \
tcl8.6-dev \
texinfo \
time \
valgrind \
wget \
zip \
swig \
expect \
g++-9 \
gcc-9 \
g++-10 \
gcc-10 \
g++-11 \
gcc-11 \
clang \
clang-12 \
clang-format-12 \
libxml2-utils
58 changes: 27 additions & 31 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# Prevents from running on forks where no custom runners are available
if: ${{ github.repository_owner == 'verilog-to-routing' }}

container: ubuntu:bionic
container: ubuntu:jammy

runs-on: [self-hosted, Linux, X64]

Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

Build:
name: 'B: Building VtR'
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -88,7 +88,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -103,7 +103,7 @@ jobs:


Format:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -116,7 +116,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -126,12 +126,12 @@ jobs:

UniTests:
name: 'U: C++ Unit Tests'
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -143,12 +143,12 @@ jobs:

Warnings:
name: 'W: Check Compilation Warnings'
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -165,7 +165,7 @@ jobs:


Regression:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
vtr_flow/**/parse_results*.txt

Sanitized:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -269,7 +269,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -289,12 +289,12 @@ jobs:

Parmys:
name: 'Parmys Basic Test'
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -312,12 +312,12 @@ jobs:

ODINII:
name: 'ODIN-II Basic Test'
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -335,12 +335,12 @@ jobs:

VQM2BLIF:
name: 'VQM2BLIF Basic Tests'
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand All @@ -355,25 +355,21 @@ jobs:
./utils/vqm2blif/test/scripts/test_vqm2blif.sh

Compatibility:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
include:
- { name: 'GCC 7 (Ubuntu Bionic - 18.04)', eval: 'CC=gcc-7 && CXX=g++-7', }
- { name: 'GCC 8 (Debian Buster)', eval: 'CC=gcc-8 && CXX=g++-8', }
- { name: 'GCC 9 (Ubuntu Focal - 20.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
- { name: 'GCC 10 (Ubuntu Hirsute - 21.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
- { name: 'GCC 11 (Latest)', eval: 'CC=gcc-11 && CXX=g++-11', }
- { name: 'Clang 6 (Ubuntu Bionic - 18.04)', eval: 'CC=clang-6.0 && CXX=clang++-6.0', }
- { name: 'Clang 7 (Debian Buster)', eval: 'CC=clang-7 && CXX=clang++-7', }
- { name: 'Clang 10 (Ubuntu Focal - 20.04)', eval: 'CC=clang-10 && CXX=clang++-10', }
- { name: 'GCC 9 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
- { name: 'GCC 10 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
- { name: 'GCC 11 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-11 && CXX=g++-11', }
- { name: 'Clang 12 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
name: 'B: ${{ matrix.name }}'
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand Down Expand Up @@ -402,12 +398,12 @@ jobs:
- ODINII
- VQM2BLIF
- Compatibility
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:

- uses: actions/setup-python@v4
with:
python-version: 3.6
python-version: 3.10.10
- uses: actions/checkout@v3
- run: ./.github/scripts/install_dependencies.sh

Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/AutoClangFormat.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ add_custom_target(format-cpp-files
COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP})

#
# Use clang-format-7 for code format
# Use clang-format-12 for code format
#
add_custom_target(format-cpp
COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP} |
xargs -P ${CPU_COUNT} clang-format-7 -style=file -i)
xargs -P ${CPU_COUNT} clang-format-12 -style=file -i)

#
# Use simple python script for fixing C like boxed comments
Expand Down
1 change: 1 addition & 0 deletions libs/libvtrutil/src/vtr_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <vector>
#include <cstddef>
#include <iterator>
#include <algorithm>
#include "vtr_range.h"

namespace vtr {
Expand Down