From bb19f67aba60b2c5a99855708adca32a83397241 Mon Sep 17 00:00:00 2001
From: Harrison Liew <harrisonliew@gmail.com>
Date: Wed, 2 Oct 2019 18:50:34 -0700
Subject: [PATCH] fix innovus 18.1 not executing python script

---
 vlsi/example-vlsi | 7 ++++++-
 vlsi/hammer       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vlsi/example-vlsi b/vlsi/example-vlsi
index 264d0d8d..516ef588 100755
--- a/vlsi/example-vlsi
+++ b/vlsi/example-vlsi
@@ -24,6 +24,8 @@ def example_tool_settings(x: hammer_vlsi.HammerTool) -> bool:
     x.append('''
 # TODO
 # Place custom TCL here
+set_db route_design_bottom_routing_layer 2
+set_db route_design_top_routing_layer 7
 ''')
     return True
 
@@ -36,7 +38,10 @@ def scale_final_gds(x: hammer_vlsi.HammerTool) -> bool:
 set fp [open "{script_file}" "w"]
 puts -nonewline $fp "{script_text}"
 close $fp
-exec python3 {script_file}
+
+# Innovus <19.1 appends some bad LD_LIBRARY_PATHS, so remove them before executing python
+set env(LD_LIBRARY_PATH) [join [lsearch -not -all -inline [split $env(LD_LIBRARY_PATH) ":"] "*INNOVUS*"] ":"]
+python3 {script_file}
 '''.format(script_text=x.technology.scale_gds_script(x.output_gds_filename), script_file=os.path.join(x.run_dir, "gds_scale.py")))
     return True
 
diff --git a/vlsi/hammer b/vlsi/hammer
index 88226815..d8fad54d 160000
--- a/vlsi/hammer
+++ b/vlsi/hammer
@@ -1 +1 @@
-Subproject commit 88226815243ae922ccd0d9d3810e3b6fcb6c97fd
+Subproject commit d8fad54d125548e50bd65dffa3a53f001e412300