Skip to content

Commit

Permalink
update latest fixes
Browse files Browse the repository at this point in the history
Signed-off-by: luarss <jluar@precisioninno.com>
  • Loading branch information
luarss committed Sep 3, 2024
1 parent 51a89b3 commit 1e34459
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 15 deletions.
1 change: 1 addition & 0 deletions docker/Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ COPY --link flow/platforms flow/platforms
COPY --link flow/util flow/util
COPY --link flow/scripts flow/scripts
COPY --link flow/designs flow/designs
COPY --link tools/AutoTuner tools/AutoTuner

COPY --link --from=orfs-builder-base /OpenROAD-flow-scripts/tools/install tools/install
COPY --link \
Expand Down
2 changes: 1 addition & 1 deletion flow/test/test_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if [ $RUN_AUTOTUNER -eq 1 ]; then
echo "[INFO FLW-0029] Installing dependencies in virtual environment."
cd ../
./tools/AutoTuner/installer.sh
./tools/AutoTuner/setup.sh
. ./tools/AutoTuner/setup.sh

# remove dashes
PLATFORM=${PLATFORM//-/}
Expand Down
2 changes: 1 addition & 1 deletion jenkins/public_nightly.Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('utils@orfs-v2.1.0') _
@Library('utils@orfs-v2.1.1') _

node {

Expand Down
2 changes: 1 addition & 1 deletion jenkins/public_tests_all.Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('utils@orfs-v2.1.0') _
@Library('utils@orfs-v2.1.1') _

node {

Expand Down
6 changes: 2 additions & 4 deletions tools/AutoTuner/installer.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
#!/usr/bin/env bash

echo "Installing AutoTuner..."

# Get the directory where the script is located
script_dir="$(dirname "${BASH_SOURCE[0]}")"
cd $script_dir

# Define the virtual environment name
venv_name="autotuner_env"
required_version="3"
python${required_version} -m venv "$script_dir/$venv_name"
source "$script_dir/$venv_name/bin/activate"
pip3 install -U -r requirements.txt
pip3 install -U -r $script_dir/requirements.txt
deactivate
12 changes: 5 additions & 7 deletions tools/AutoTuner/setup.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
#!/usr/bin/env bash

echo "Setting up AutoTuner..."

# Get the directory of the current script
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
script_dir="$(dirname "${BASH_SOURCE[0]}")"

# Check if the activation script exists
VENV_PATH="$SCRIPT_DIR/autotuner_env/bin/activate"
if [ ! -f "$VENV_PATH" ]; then
echo "Error: Virtual environment activation script not found at $VENV_PATH"
venv_path="$script_dir/autotuner_env/bin/activate"
if [ ! -f "$venv_path" ]; then
echo "Error: Virtual environment activation script not found at $venv_path"
echo "Please run installer.sh for installing the packages."
exit 1
fi

# Source the activation script to activate the virtual environment
source "$VENV_PATH"
source "$venv_path"
echo "Virtual environment activated successfully."
2 changes: 1 addition & 1 deletion tools/AutoTuner/src/autotuner/distributed.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ def openroad(base_dir, parameters, flow_variant, path=""):
log_path = report_path = os.getcwd() + "/"

export_command = f"export PATH={INSTALL_PATH}/OpenROAD/bin"
export_command += f":{INSTALL_PATH}/yosys/bin"
export_command += f":{INSTALL_PATH}/yosys/bin:$PATH"
export_command += " && "

make_command = export_command
Expand Down

0 comments on commit 1e34459

Please sign in to comment.