Merge pull request #377 from normanpatrick/development

fixed references to estimate.py code

Author: mdko

ipynb-examples/example7-synth-timing-draft.ipynb

@@ -25,8 +25,7 @@
    },
    "outputs": [],
    "source": [
-    "import pyrtl\n",
-    "from pyrtl.analysis import estimate"
+    "import pyrtl"
    ]
   },
   {
@@ -77,7 +76,7 @@
    "source": [
     "# Generating timing analysis information\n",
     "print(\"Pre Synthesis:\")\n",
-    "timing = estimate.TimingAnalysis()\n",
+    "timing = pyrtl.TimingAnalysis()\n",
     "timing.print_max_length()"
    ]
   },
@@ -119,7 +118,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "logic_area, mem_area = estimate.area_estimation(tech_in_nm=65)\n",
+    "logic_area, mem_area = pyrtl.area_estimation(tech_in_nm=65)\n",
     "est_area = logic_area + mem_area\n",
     "print(\"Estimated Area of block\", est_area, \"sq mm\")\n",
     "print()"
@@ -154,7 +153,7 @@
     "pyrtl.synthesize()\n",
     "\n",
     "print(\"Pre Optimization:\")\n",
-    "timing = estimate.TimingAnalysis()\n",
+    "timing = pyrtl.TimingAnalysis()\n",
     "timing.print_max_length()\n",
     "for net in pyrtl.working_block().logic:\n",
     "    print(str(net))\n",
@@ -201,7 +200,7 @@
    "outputs": [],
    "source": [
     "print(\"Post Optimization:\")\n",
-    "timing = estimate.TimingAnalysis()\n",
+    "timing = pyrtl.TimingAnalysis()\n",
     "timing.print_max_length()"
    ]
   },
@@ -239,7 +238,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.3"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

ipynb-examples/example8-verilog.ipynb

@@ -28,8 +28,7 @@
    "source": [
     "import random\n",
     "import io\n",
-    "import pyrtl\n",
-    "from pyrtl.analysis import estimate"
+    "import pyrtl"
    ]
   },
   {
@@ -305,7 +304,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.3"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,