From 653a7f8d0060121a02e3269df14097f05fe89e21 Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Wed, 1 Feb 2023 11:29:15 -0500 Subject: [PATCH 1/8] Update temp_sense_genCollab.ipynb Remove PATH information that is misleading and remove the python version that confuses the google collab environment. Updated the version of dependencies --- .../temp-sense-gen/temp_sense_genCollab.ipynb | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index f66045065..14f1e790e 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -122,14 +122,16 @@ "import pathlib\n", "import sys\n", "\n", - "!apt-get install -y ruby-full time build-essential\n", - "!apt install -f libqt4-designer libqt4-xml libqt4-sql libqt4-network libqtcore4 libqtgui4\n", + "!apt install -y time build-essential\n", + "!apt install qt5-default qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5svg5-dev -y\n", + "!apt install ruby ruby-dev libz-dev python3-dev -y\n" + "!wget https://www.klayout.org/downloads/Ubuntu-20/klayout_0.28.3-1_amd64.deb\n", + "!dpkg -i klayout_0.28.3-1_amd64.deb\n", "!curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba\n", "conda_prefix_path = pathlib.Path('conda-env')\n", "CONDA_PREFIX = str(conda_prefix_path.resolve())\n", "%env CONDA_PREFIX={CONDA_PREFIX}\n", "!bin/micromamba create --yes --prefix $CONDA_PREFIX\n", - "!echo 'python ==3.7*' >> {CONDA_PREFIX}/conda-meta/pinned\n", "!bin/micromamba install --yes --prefix $CONDA_PREFIX \\\n", " --channel litex-hub \\\n", " --channel main \\\n", @@ -142,10 +144,7 @@ " --channel conda-forge \\\n", " svgutils ngspice\n", "\n", - "!wget https://www.klayout.org/downloads/Ubuntu-18/klayout_0.27.11-1_amd64.deb\n", - "!dpkg -i klayout_0.27.11-1_amd64.deb\n", "!python -m pip install pyyaml click gdstk --no-binary gdstk\n", - "PATH = os.environ['PATH']\n", "\n", "# clone OpenFASOC repo\n", "!git clone https://github.com/idea-fasoc/OpenFASOC\n", @@ -158,13 +157,7 @@ "!cp OpenFASOC/openfasoc/common/platforms/sky130hd/fill.json OpenFASOC/docs/source/notebooks/aux_files\n", "\n", "%env PDK_ROOT={CONDA_PREFIX}/share/pdk\n", - "%env OPENFASOC_ROOT={OPENFASOC_ROOT}\n", - "PATH = os.environ['PATH']\n", - "%env PATH={PATH}:{CONDA_PREFIX}/bin:{OPENFASOC_ROOT}:{OPENFASOC_ROOT}/openfasoc/generators/temp-sense-gen/tools\n", - "LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')\n", - "%env LD_LIBRARY_PATH={LD_LIBRARY_PATH}:{CONDA_PREFIX}/lib\n", - "site_package_path = conda_prefix_path / 'lib/python3.7/site-packages'\n", - "sys.path.append(str(site_package_path.resolve()))" + "os.environ['PATH'] += ':/content/conda-env/bin\n'" ] }, { From 8078cff0fc96eca5f272ea6518c0d4765a99f091 Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Wed, 1 Feb 2023 11:33:45 -0500 Subject: [PATCH 2/8] Update temp_sense_genCollab.ipynb --- docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index 14f1e790e..5414a6c1c 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -157,7 +157,7 @@ "!cp OpenFASOC/openfasoc/common/platforms/sky130hd/fill.json OpenFASOC/docs/source/notebooks/aux_files\n", "\n", "%env PDK_ROOT={CONDA_PREFIX}/share/pdk\n", - "os.environ['PATH'] += ':/content/conda-env/bin\n'" + "os.environ['PATH'] += \":/content/conda-env/bin\"\n" ] }, { From 8fd90a9b624f3f754c8bc826f06f359b19877a12 Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Wed, 1 Feb 2023 11:35:15 -0500 Subject: [PATCH 3/8] Update temp_sense_genCollab.ipynb --- docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index 5414a6c1c..aeaaa9829 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -124,7 +124,7 @@ "\n", "!apt install -y time build-essential\n", "!apt install qt5-default qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5svg5-dev -y\n", - "!apt install ruby ruby-dev libz-dev python3-dev -y\n" + "!apt install ruby ruby-dev libz-dev python3-dev -y\n", "!wget https://www.klayout.org/downloads/Ubuntu-20/klayout_0.28.3-1_amd64.deb\n", "!dpkg -i klayout_0.28.3-1_amd64.deb\n", "!curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba\n", From 41c581472ce63de8390430b110735ee6169b62b8 Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Sat, 4 Feb 2023 12:46:21 -0500 Subject: [PATCH 4/8] Update temp_sense_genCollab.ipynb --- .../source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index aeaaa9829..db78aab6e 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -139,7 +139,8 @@ " magic \\\n", " netgen \\\n", " openroad \\\n", - " yosys\n", + " yosys \\\n", + " klayout \n", "!bin/micromamba install --yes --prefix $CONDA_PREFIX \\\n", " --channel conda-forge \\\n", " svgutils ngspice\n", From 0d27553d57373c9d75b3f806d65ec2e4e00d771f Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Sat, 4 Feb 2023 12:47:10 -0500 Subject: [PATCH 5/8] Update temp_sense_genCollab.ipynb --- .../notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index db78aab6e..e9eb13718 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -122,11 +122,6 @@ "import pathlib\n", "import sys\n", "\n", - "!apt install -y time build-essential\n", - "!apt install qt5-default qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev libqt5multimediawidgets5 libqt5svg5-dev -y\n", - "!apt install ruby ruby-dev libz-dev python3-dev -y\n", - "!wget https://www.klayout.org/downloads/Ubuntu-20/klayout_0.28.3-1_amd64.deb\n", - "!dpkg -i klayout_0.28.3-1_amd64.deb\n", "!curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba\n", "conda_prefix_path = pathlib.Path('conda-env')\n", "CONDA_PREFIX = str(conda_prefix_path.resolve())\n", From 0dc777b6c53ce034cd6e42d841d70ec0383bed23 Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Sat, 4 Feb 2023 14:40:52 -0500 Subject: [PATCH 6/8] Update temp_sense_genCollab.ipynb --- docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index e9eb13718..3b5bac3f2 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -122,6 +122,7 @@ "import pathlib\n", "import sys\n", "\n", + "!apt install -y time build-essential\n", "!curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba\n", "conda_prefix_path = pathlib.Path('conda-env')\n", "CONDA_PREFIX = str(conda_prefix_path.resolve())\n", From 63d5de0734571b3c613814227e877f1354b439c3 Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Sat, 4 Feb 2023 14:49:28 -0500 Subject: [PATCH 7/8] Update temp_sense_genCollab.ipynb --- .../source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index 3b5bac3f2..2940a0026 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -127,6 +127,9 @@ "conda_prefix_path = pathlib.Path('conda-env')\n", "CONDA_PREFIX = str(conda_prefix_path.resolve())\n", "%env CONDA_PREFIX={CONDA_PREFIX}\n", + "!echo 'python ==3.7*' >> {CONDA_PREFIX}/conda-meta/pinned\n", + "site_package_path = conda_prefix_path / 'lib/python3.7/site-packages'\n", + "sys.path.append(str(site_package_path.resolve()))\n", "!bin/micromamba create --yes --prefix $CONDA_PREFIX\n", "!bin/micromamba install --yes --prefix $CONDA_PREFIX \\\n", " --channel litex-hub \\\n", From 054418f60d5663705a0aacc30465abb6cb88642d Mon Sep 17 00:00:00 2001 From: Qianxu Li <81498994+Jerry-lqx@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:24:24 -0500 Subject: [PATCH 8/8] update path info --- .../notebooks/temp-sense-gen/temp_sense_genCollab.ipynb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb index 2940a0026..1862a724a 100644 --- a/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb +++ b/docs/source/notebooks/temp-sense-gen/temp_sense_genCollab.ipynb @@ -145,7 +145,7 @@ " svgutils ngspice\n", "\n", "!python -m pip install pyyaml click gdstk --no-binary gdstk\n", - "\n", + "PATH = os.environ['PATH']\n", "# clone OpenFASOC repo\n", "!git clone https://github.com/idea-fasoc/OpenFASOC\n", "# setup env\n", @@ -157,7 +157,11 @@ "!cp OpenFASOC/openfasoc/common/platforms/sky130hd/fill.json OpenFASOC/docs/source/notebooks/aux_files\n", "\n", "%env PDK_ROOT={CONDA_PREFIX}/share/pdk\n", - "os.environ['PATH'] += \":/content/conda-env/bin\"\n" + "%env OPENFASOC_ROOT={OPENFASOC_ROOT}\n", + "PATH = os.environ['PATH']\n", + "%env PATH={PATH}:{CONDA_PREFIX}/bin:{OPENFASOC_ROOT}:{OPENFASOC_ROOT}/openfasoc/generators/temp-sense-gen/tools\n", + "LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')\n", + "%env LD_LIBRARY_PATH={LD_LIBRARY_PATH}:{CONDA_PREFIX}/lib/python3.7\n" ] }, {