From 3ce866f2eb273cf75e3fa7d53d78612b338ef7c0 Mon Sep 17 00:00:00 2001 From: Andrew Pond <32227768+apond308@users.noreply.github.com> Date: Mon, 26 Jul 2021 15:12:59 -0600 Subject: [PATCH 1/5] Update compile.rst --- docs/source/tutorials/getting_started/compile.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/tutorials/getting_started/compile.rst b/docs/source/tutorials/getting_started/compile.rst index 85c9702db..5c5b7e55d 100644 --- a/docs/source/tutorials/getting_started/compile.rst +++ b/docs/source/tutorials/getting_started/compile.rst @@ -46,6 +46,9 @@ In particular, OpenFPGA requires specific versions for the following dependencie :iverilog: version 10.1+ is required to run Verilog-to-Verification flow + +:envyaml: + python package envyaml is required: 'python3 -m pip install envyaml' .. _install_dependencies_build: https://github.com/lnis-uofu/OpenFPGA/blob/master/.github/workflows/install_dependencies_build.sh From 1c0bec1c5a256e55e14513aa37367361f8d01e11 Mon Sep 17 00:00:00 2001 From: Andrew Pond <32227768+apond308@users.noreply.github.com> Date: Mon, 26 Jul 2021 15:17:25 -0600 Subject: [PATCH 2/5] Update compile.rst --- docs/source/tutorials/getting_started/compile.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/source/tutorials/getting_started/compile.rst b/docs/source/tutorials/getting_started/compile.rst index 5c5b7e55d..caeeb50cc 100644 --- a/docs/source/tutorials/getting_started/compile.rst +++ b/docs/source/tutorials/getting_started/compile.rst @@ -48,7 +48,10 @@ In particular, OpenFPGA requires specific versions for the following dependencie version 10.1+ is required to run Verilog-to-Verification flow :envyaml: - python package envyaml is required: 'python3 -m pip install envyaml' + python package envyaml is required. + .. code-block:: shell + + python3 -m pip install envyaml .. _install_dependencies_build: https://github.com/lnis-uofu/OpenFPGA/blob/master/.github/workflows/install_dependencies_build.sh From a8a8c25a216f1e94c1d2a9bfe575c67fc8d9b2a0 Mon Sep 17 00:00:00 2001 From: Andrew Pond <32227768+apond308@users.noreply.github.com> Date: Mon, 26 Jul 2021 15:18:23 -0600 Subject: [PATCH 3/5] Update compile.rst --- docs/source/tutorials/getting_started/compile.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/source/tutorials/getting_started/compile.rst b/docs/source/tutorials/getting_started/compile.rst index caeeb50cc..0e8cb8563 100644 --- a/docs/source/tutorials/getting_started/compile.rst +++ b/docs/source/tutorials/getting_started/compile.rst @@ -48,9 +48,8 @@ In particular, OpenFPGA requires specific versions for the following dependencie version 10.1+ is required to run Verilog-to-Verification flow :envyaml: - python package envyaml is required. - .. code-block:: shell - + python package envyaml is required: + python3 -m pip install envyaml .. _install_dependencies_build: https://github.com/lnis-uofu/OpenFPGA/blob/master/.github/workflows/install_dependencies_build.sh From c31c1d8b049e1cc09fdcb2850d564971c51b0a44 Mon Sep 17 00:00:00 2001 From: Will <5217539+WRansohoff@users.noreply.github.com> Date: Fri, 13 Aug 2021 11:08:09 -0400 Subject: [PATCH 4/5] Accept absolute project paths as inputs to the 'run_fpga_task.py' script. --- openfpga_flow/scripts/run_fpga_task.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openfpga_flow/scripts/run_fpga_task.py b/openfpga_flow/scripts/run_fpga_task.py index 7665cfb1b..c1ced3ccb 100644 --- a/openfpga_flow/scripts/run_fpga_task.py +++ b/openfpga_flow/scripts/run_fpga_task.py @@ -168,13 +168,19 @@ def generate_each_task_actions(taskname): # Check if task directory exists and consistent local_tasks = os.path.join(*(taskname)) repo_tasks = os.path.join(gc["task_dir"], *(taskname)) + abs_tasks = os.path.abspath('/' + local_tasks) if os.path.isdir(local_tasks): os.chdir(local_tasks) curr_task_dir = os.path.abspath(os.getcwd()) + elif os.path.isdir(abs_tasks): + curr_task_dir = abs_tasks elif os.path.isdir(repo_tasks): curr_task_dir = repo_tasks else: - clean_up_and_exit("Task directory [%s] not found" % taskname + " locally at [%s]" % local_tasks + " or in OpenFPGA task directory [%s]" % repo_tasks) + clean_up_and_exit("Task directory [%s] not found" % taskname + + " locally at [%s]" % local_tasks + + ", absolutely at [%s]" % abs_tasks + + ", or in OpenFPGA task directory [%s]" % repo_tasks) os.chdir(curr_task_dir) From 1c09b8c3e0dc773a4bf774cac2f0e6473b7b9bc2 Mon Sep 17 00:00:00 2001 From: ANDREW HARRIS POND Date: Tue, 17 Aug 2021 10:18:51 -0600 Subject: [PATCH 5/5] fixed python instruction --- docs/source/tutorials/getting_started/compile.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/tutorials/getting_started/compile.rst b/docs/source/tutorials/getting_started/compile.rst index 0e8cb8563..17d333be0 100644 --- a/docs/source/tutorials/getting_started/compile.rst +++ b/docs/source/tutorials/getting_started/compile.rst @@ -47,10 +47,10 @@ In particular, OpenFPGA requires specific versions for the following dependencie :iverilog: version 10.1+ is required to run Verilog-to-Verification flow -:envyaml: - python package envyaml is required: +:python dependencies: + python packages are also required: - python3 -m pip install envyaml + python3 -m pip install -r requirements.txt .. _install_dependencies_build: https://github.com/lnis-uofu/OpenFPGA/blob/master/.github/workflows/install_dependencies_build.sh