diff --git a/dependencies/tool_metadata.yml b/dependencies/tool_metadata.yml index e8048f360..f340f8a81 100644 --- a/dependencies/tool_metadata.yml +++ b/dependencies/tool_metadata.yml @@ -56,7 +56,7 @@ in_install: false - name: openroad_app repo: https://github.com/The-OpenROAD-Project/OpenROAD - commit: 0a6d0fd469bc674417036342994520ee2e0a2727 + commit: bdc8e944cd08ba8edebeca19fa531bd026690330 in_install: false - name: git repo: https://github.com/git/git diff --git a/docker/build_base/Dockerfile b/docker/build_base/Dockerfile index 709716034..5a94c2c52 100644 --- a/docker/build_base/Dockerfile +++ b/docker/build_base/Dockerfile @@ -30,6 +30,14 @@ RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 60 RUN git config --global user.name "OpenLane User" RUN git config --global user.email "openlane.user@localhost" +ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc \ + CPP=/opt/rh/devtoolset-8/root/usr/bin/cpp \ + CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ + PATH=/opt/rh/devtoolset-8/root/usr/bin:$PATH \ + LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:$LD_LIBRARY_PATH + +ENV LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7.0/root/usr/lib64:/opt/rh/llvm-toolset-7.0/root/usr/lib:/opt/rh/llvm-toolset-7.0/root/usr/lib64/dyninst:/opt/rh/llvm-toolset-7.0/root/usr/lib/dyninst:/opt/rh/llvm-toolset-7.0/root/usr/lib64:/opt/rh/llvm-toolset-7.0/root/usr/lib:$LD_LIBRARY_PATH + # Install Python Dependencies ## Wheel Build Dependencies RUN python3 -m pip install --no-cache-dir --upgrade pip @@ -42,10 +50,3 @@ RUN python3 -m pip install --no-cache-dir -r /pip_dependencies.txt RUN yum update -y ca-certificates # Environment Configuration -ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc \ - CPP=/opt/rh/devtoolset-8/root/usr/bin/cpp \ - CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \ - PATH=/opt/rh/devtoolset-8/root/usr/bin:$PATH \ - LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:$LD_LIBRARY_PATH - -ENV LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7.0/root/usr/lib64:/opt/rh/llvm-toolset-7.0/root/usr/lib:/opt/rh/llvm-toolset-7.0/root/usr/lib64/dyninst:/opt/rh/llvm-toolset-7.0/root/usr/lib/dyninst:/opt/rh/llvm-toolset-7.0/root/usr/lib64:/opt/rh/llvm-toolset-7.0/root/usr/lib:$LD_LIBRARY_PATH diff --git a/scripts/openroad/droute.tcl b/scripts/openroad/droute.tcl index ee2fd9e68..c5d3a084f 100755 --- a/scripts/openroad/droute.tcl +++ b/scripts/openroad/droute.tcl @@ -26,7 +26,9 @@ if { [info exists ::env(DRT_MAX_LAYER)] } { set max_layer $::env(DRT_MAX_LAYER) } -read_guides $::env(CURRENT_GUIDE) +if { [info exists ::env(IO_READ_DEF)] && $::env(IO_READ_DEF) } { + read_guides $::env(CURRENT_GUIDE) +} detailed_route\ -bottom_routing_layer $min_layer\ @@ -37,4 +39,4 @@ detailed_route\ -or_seed 42\ -verbose 1 -write \ No newline at end of file +write