Merge branch 'master' into router

compiler/globals.py

@@ -33,7 +33,7 @@ def parse_args():
     global OPTS
 
     option_list = {
-        optparse.make_option("-b", "--backannotated", dest="run_pex",
+        optparse.make_option("-b", "--backannotated", action="store_true", dest="run_pex",
                              help="back annotated simulation for characterizer"),
         optparse.make_option("-o", "--output", dest="out_name",
                              help="Base output file name.", metavar="FILE"),
@@ -50,10 +50,10 @@ def parse_args():
         optparse.make_option("-s", "--spiceversion", dest="spice_version",
                              help="Spice simulator name"),
         # TODO: Why is this -f?
-        optparse.make_option("-f", "--trim_noncritical", dest="trim_noncritical",
+        optparse.make_option("-f", "--trim_noncritical", action="store_true", dest="trim_noncritical",
                              help="Trim noncritical memory cells during simulation"),
-        optparse.make_option("-a", "--analyticaldelay", dest="analytical_delay",
+        optparse.make_option("-a", "--analytical", action="store_true", dest="analytical_delay",
-                             help="Use analytical model to calculate delay or not")
+                             help="Use analytical model to calculate delay")
     }
 # -h --help is implicit.
 

compiler/options.py

@@ -36,4 +36,4 @@ class options(optparse.Values):
     out_path = ""
     # Define the output file base name
     out_name = ""
-    analytical_delay = True
+    analytical_delay = False

setpaths.csh

@@ -0,0 +1,8 @@
+#!/bin/csh
+# This is a csh utility script to set the paths to the current
+# directory of OpenRAM. It must be sourced in the local directory
+# like this:
+# source setpaths.csh
+
+setenv OPENRAM_HOME "`pwd`/compiler"
+setenv OPENRAM_TECH "`pwd`/technology"

setpaths.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# This is a bash utility script to set the paths to the current
+# directory of OpenRAM. It must be sourced in the local directory
+# like this:
+# source setpaths.sh
+
+export OPENRAM_HOME="`pwd`/compiler"
+export OPENRAM_TECH="`pwd`/technology"