From 8af2789e536c222319441a1b7f30361aedad903c Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 29 May 2020 12:12:47 +0200 Subject: [PATCH 1/2] setup: re-add utils package Signed-off-by: Alessandro Comodi --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index deed4839..d45b1b33 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ setuptools.setup( long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/SymbiFlow/prjxray", - packages=['prjxray'], + packages=['prjxray', 'utils'], classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: ISC License", From 8e4e400b179b185bda70b3c2584038556ecabd2b Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Mon, 1 Jun 2020 11:13:49 +0200 Subject: [PATCH 2/2] move fasm2frames to prjxray to avoid including utils in python package Signed-off-by: Alessandro Comodi --- minitests/roi_harness/runme.sh | 2 +- {utils => prjxray}/fasm2frames.py | 6 +++--- {utils => prjxray}/test_data/db/segbits_clblm_l.db | 0 {utils => prjxray}/test_data/db/segbits_hclk_ioi3.db | 0 {utils => prjxray}/test_data/db/segbits_hclk_l.db | 0 {utils => prjxray}/test_data/db/segbits_int_l.db | 0 {utils => prjxray}/test_data/db/segbits_liob33.db | 0 {utils => prjxray}/test_data/db/segbits_riob33.db | 0 {utils => prjxray}/test_data/db/tile_type_CLBLM_L.json | 0 {utils => prjxray}/test_data/db/tile_type_HCLK_IOI3.json | 0 {utils => prjxray}/test_data/db/tile_type_HCLK_L.json | 0 {utils => prjxray}/test_data/db/tile_type_INT_L.json | 0 {utils => prjxray}/test_data/db/tile_type_LIOB33.json | 0 {utils => prjxray}/test_data/db/tile_type_LIOB33_SING.json | 0 {utils => prjxray}/test_data/db/tile_type_RIOB33.json | 0 {utils => prjxray}/test_data/db/tile_type_RIOB33_SING.json | 0 {utils => prjxray}/test_data/db/xc7/package_pins.csv | 0 {utils => prjxray}/test_data/db/xc7/part.json | 0 {utils => prjxray}/test_data/db/xc7/tilegrid.json | 0 {utils => prjxray}/test_data/ff_int.fasm | 0 {utils => prjxray}/test_data/ff_int/.gitignore | 0 {utils => prjxray}/test_data/ff_int/design.bits | 0 {utils => prjxray}/test_data/ff_int/top.v | 0 {utils => prjxray}/test_data/ff_int_0s.fasm | 0 {utils => prjxray}/test_data/ff_int_op1.fasm | 0 {utils => prjxray}/test_data/iob/liob_stepdown.bits | 0 {utils => prjxray}/test_data/iob/liob_stepdown.fasm | 0 {utils => prjxray}/test_data/iob/riob_stepdown.bits | 0 {utils => prjxray}/test_data/iob/riob_stepdown.fasm | 0 {utils => prjxray}/test_data/lut.fasm | 0 {utils => prjxray}/test_data/lut_int.fasm | 0 {utils => prjxray}/test_data/lut_int/.gitignore | 0 {utils => prjxray}/test_data/lut_int/design.bits | 0 {utils => prjxray}/test_data/lut_int/top.v | 0 {utils => prjxray}/test_fasm2frames.py | 3 +-- setup.py | 4 ++-- utils/environment.sh | 3 ++- 37 files changed, 9 insertions(+), 9 deletions(-) rename {utils => prjxray}/fasm2frames.py (98%) rename {utils => prjxray}/test_data/db/segbits_clblm_l.db (100%) rename {utils => prjxray}/test_data/db/segbits_hclk_ioi3.db (100%) rename {utils => prjxray}/test_data/db/segbits_hclk_l.db (100%) rename {utils => prjxray}/test_data/db/segbits_int_l.db (100%) rename {utils => prjxray}/test_data/db/segbits_liob33.db (100%) rename {utils => prjxray}/test_data/db/segbits_riob33.db (100%) rename {utils => prjxray}/test_data/db/tile_type_CLBLM_L.json (100%) rename {utils => prjxray}/test_data/db/tile_type_HCLK_IOI3.json (100%) rename {utils => prjxray}/test_data/db/tile_type_HCLK_L.json (100%) rename {utils => prjxray}/test_data/db/tile_type_INT_L.json (100%) rename {utils => prjxray}/test_data/db/tile_type_LIOB33.json (100%) rename {utils => prjxray}/test_data/db/tile_type_LIOB33_SING.json (100%) rename {utils => prjxray}/test_data/db/tile_type_RIOB33.json (100%) rename {utils => prjxray}/test_data/db/tile_type_RIOB33_SING.json (100%) rename {utils => prjxray}/test_data/db/xc7/package_pins.csv (100%) rename {utils => prjxray}/test_data/db/xc7/part.json (100%) rename {utils => prjxray}/test_data/db/xc7/tilegrid.json (100%) rename {utils => prjxray}/test_data/ff_int.fasm (100%) rename {utils => prjxray}/test_data/ff_int/.gitignore (100%) rename {utils => prjxray}/test_data/ff_int/design.bits (100%) rename {utils => prjxray}/test_data/ff_int/top.v (100%) rename {utils => prjxray}/test_data/ff_int_0s.fasm (100%) rename {utils => prjxray}/test_data/ff_int_op1.fasm (100%) rename {utils => prjxray}/test_data/iob/liob_stepdown.bits (100%) rename {utils => prjxray}/test_data/iob/liob_stepdown.fasm (100%) rename {utils => prjxray}/test_data/iob/riob_stepdown.bits (100%) rename {utils => prjxray}/test_data/iob/riob_stepdown.fasm (100%) rename {utils => prjxray}/test_data/lut.fasm (100%) rename {utils => prjxray}/test_data/lut_int.fasm (100%) rename {utils => prjxray}/test_data/lut_int/.gitignore (100%) rename {utils => prjxray}/test_data/lut_int/design.bits (100%) rename {utils => prjxray}/test_data/lut_int/top.v (100%) rename {utils => prjxray}/test_fasm2frames.py (99%) diff --git a/minitests/roi_harness/runme.sh b/minitests/roi_harness/runme.sh index fc64fdca..7bfd0719 100755 --- a/minitests/roi_harness/runme.sh +++ b/minitests/roi_harness/runme.sh @@ -68,7 +68,7 @@ test -z "$(fgrep CRITICAL vivado.log)" ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit python3 ${XRAY_DIR}/utils/bit2fasm.py --verbose design.bit > design.fasm -python3 ${XRAY_DIR}/utils/fasm2frames.py design.fasm design.frm +python3 ${XRAY_DIR}/prjxray/fasm2frames.py design.fasm design.frm PYTHONPATH=$PYTHONPATH:$XRAY_DIR/utils python3 ../create_design_json.py \ --design_info_txt design_info.txt \ --design_txt design.txt \ diff --git a/utils/fasm2frames.py b/prjxray/fasm2frames.py similarity index 98% rename from utils/fasm2frames.py rename to prjxray/fasm2frames.py index fe384db3..1483fffe 100755 --- a/utils/fasm2frames.py +++ b/prjxray/fasm2frames.py @@ -20,9 +20,9 @@ import csv from collections import defaultdict -from prjxray import fasm_assembler, util -from prjxray.db import Database -from prjxray.roi import Roi +from . import fasm_assembler, util +from .db import Database +from .roi import Roi import sys diff --git a/utils/test_data/db/segbits_clblm_l.db b/prjxray/test_data/db/segbits_clblm_l.db similarity index 100% rename from utils/test_data/db/segbits_clblm_l.db rename to prjxray/test_data/db/segbits_clblm_l.db diff --git a/utils/test_data/db/segbits_hclk_ioi3.db b/prjxray/test_data/db/segbits_hclk_ioi3.db similarity index 100% rename from utils/test_data/db/segbits_hclk_ioi3.db rename to prjxray/test_data/db/segbits_hclk_ioi3.db diff --git a/utils/test_data/db/segbits_hclk_l.db b/prjxray/test_data/db/segbits_hclk_l.db similarity index 100% rename from utils/test_data/db/segbits_hclk_l.db rename to prjxray/test_data/db/segbits_hclk_l.db diff --git a/utils/test_data/db/segbits_int_l.db b/prjxray/test_data/db/segbits_int_l.db similarity index 100% rename from utils/test_data/db/segbits_int_l.db rename to prjxray/test_data/db/segbits_int_l.db diff --git a/utils/test_data/db/segbits_liob33.db b/prjxray/test_data/db/segbits_liob33.db similarity index 100% rename from utils/test_data/db/segbits_liob33.db rename to prjxray/test_data/db/segbits_liob33.db diff --git a/utils/test_data/db/segbits_riob33.db b/prjxray/test_data/db/segbits_riob33.db similarity index 100% rename from utils/test_data/db/segbits_riob33.db rename to prjxray/test_data/db/segbits_riob33.db diff --git a/utils/test_data/db/tile_type_CLBLM_L.json b/prjxray/test_data/db/tile_type_CLBLM_L.json similarity index 100% rename from utils/test_data/db/tile_type_CLBLM_L.json rename to prjxray/test_data/db/tile_type_CLBLM_L.json diff --git a/utils/test_data/db/tile_type_HCLK_IOI3.json b/prjxray/test_data/db/tile_type_HCLK_IOI3.json similarity index 100% rename from utils/test_data/db/tile_type_HCLK_IOI3.json rename to prjxray/test_data/db/tile_type_HCLK_IOI3.json diff --git a/utils/test_data/db/tile_type_HCLK_L.json b/prjxray/test_data/db/tile_type_HCLK_L.json similarity index 100% rename from utils/test_data/db/tile_type_HCLK_L.json rename to prjxray/test_data/db/tile_type_HCLK_L.json diff --git a/utils/test_data/db/tile_type_INT_L.json b/prjxray/test_data/db/tile_type_INT_L.json similarity index 100% rename from utils/test_data/db/tile_type_INT_L.json rename to prjxray/test_data/db/tile_type_INT_L.json diff --git a/utils/test_data/db/tile_type_LIOB33.json b/prjxray/test_data/db/tile_type_LIOB33.json similarity index 100% rename from utils/test_data/db/tile_type_LIOB33.json rename to prjxray/test_data/db/tile_type_LIOB33.json diff --git a/utils/test_data/db/tile_type_LIOB33_SING.json b/prjxray/test_data/db/tile_type_LIOB33_SING.json similarity index 100% rename from utils/test_data/db/tile_type_LIOB33_SING.json rename to prjxray/test_data/db/tile_type_LIOB33_SING.json diff --git a/utils/test_data/db/tile_type_RIOB33.json b/prjxray/test_data/db/tile_type_RIOB33.json similarity index 100% rename from utils/test_data/db/tile_type_RIOB33.json rename to prjxray/test_data/db/tile_type_RIOB33.json diff --git a/utils/test_data/db/tile_type_RIOB33_SING.json b/prjxray/test_data/db/tile_type_RIOB33_SING.json similarity index 100% rename from utils/test_data/db/tile_type_RIOB33_SING.json rename to prjxray/test_data/db/tile_type_RIOB33_SING.json diff --git a/utils/test_data/db/xc7/package_pins.csv b/prjxray/test_data/db/xc7/package_pins.csv similarity index 100% rename from utils/test_data/db/xc7/package_pins.csv rename to prjxray/test_data/db/xc7/package_pins.csv diff --git a/utils/test_data/db/xc7/part.json b/prjxray/test_data/db/xc7/part.json similarity index 100% rename from utils/test_data/db/xc7/part.json rename to prjxray/test_data/db/xc7/part.json diff --git a/utils/test_data/db/xc7/tilegrid.json b/prjxray/test_data/db/xc7/tilegrid.json similarity index 100% rename from utils/test_data/db/xc7/tilegrid.json rename to prjxray/test_data/db/xc7/tilegrid.json diff --git a/utils/test_data/ff_int.fasm b/prjxray/test_data/ff_int.fasm similarity index 100% rename from utils/test_data/ff_int.fasm rename to prjxray/test_data/ff_int.fasm diff --git a/utils/test_data/ff_int/.gitignore b/prjxray/test_data/ff_int/.gitignore similarity index 100% rename from utils/test_data/ff_int/.gitignore rename to prjxray/test_data/ff_int/.gitignore diff --git a/utils/test_data/ff_int/design.bits b/prjxray/test_data/ff_int/design.bits similarity index 100% rename from utils/test_data/ff_int/design.bits rename to prjxray/test_data/ff_int/design.bits diff --git a/utils/test_data/ff_int/top.v b/prjxray/test_data/ff_int/top.v similarity index 100% rename from utils/test_data/ff_int/top.v rename to prjxray/test_data/ff_int/top.v diff --git a/utils/test_data/ff_int_0s.fasm b/prjxray/test_data/ff_int_0s.fasm similarity index 100% rename from utils/test_data/ff_int_0s.fasm rename to prjxray/test_data/ff_int_0s.fasm diff --git a/utils/test_data/ff_int_op1.fasm b/prjxray/test_data/ff_int_op1.fasm similarity index 100% rename from utils/test_data/ff_int_op1.fasm rename to prjxray/test_data/ff_int_op1.fasm diff --git a/utils/test_data/iob/liob_stepdown.bits b/prjxray/test_data/iob/liob_stepdown.bits similarity index 100% rename from utils/test_data/iob/liob_stepdown.bits rename to prjxray/test_data/iob/liob_stepdown.bits diff --git a/utils/test_data/iob/liob_stepdown.fasm b/prjxray/test_data/iob/liob_stepdown.fasm similarity index 100% rename from utils/test_data/iob/liob_stepdown.fasm rename to prjxray/test_data/iob/liob_stepdown.fasm diff --git a/utils/test_data/iob/riob_stepdown.bits b/prjxray/test_data/iob/riob_stepdown.bits similarity index 100% rename from utils/test_data/iob/riob_stepdown.bits rename to prjxray/test_data/iob/riob_stepdown.bits diff --git a/utils/test_data/iob/riob_stepdown.fasm b/prjxray/test_data/iob/riob_stepdown.fasm similarity index 100% rename from utils/test_data/iob/riob_stepdown.fasm rename to prjxray/test_data/iob/riob_stepdown.fasm diff --git a/utils/test_data/lut.fasm b/prjxray/test_data/lut.fasm similarity index 100% rename from utils/test_data/lut.fasm rename to prjxray/test_data/lut.fasm diff --git a/utils/test_data/lut_int.fasm b/prjxray/test_data/lut_int.fasm similarity index 100% rename from utils/test_data/lut_int.fasm rename to prjxray/test_data/lut_int.fasm diff --git a/utils/test_data/lut_int/.gitignore b/prjxray/test_data/lut_int/.gitignore similarity index 100% rename from utils/test_data/lut_int/.gitignore rename to prjxray/test_data/lut_int/.gitignore diff --git a/utils/test_data/lut_int/design.bits b/prjxray/test_data/lut_int/design.bits similarity index 100% rename from utils/test_data/lut_int/design.bits rename to prjxray/test_data/lut_int/design.bits diff --git a/utils/test_data/lut_int/top.v b/prjxray/test_data/lut_int/top.v similarity index 100% rename from utils/test_data/lut_int/top.v rename to prjxray/test_data/lut_int/top.v diff --git a/utils/test_fasm2frames.py b/prjxray/test_fasm2frames.py similarity index 99% rename from utils/test_fasm2frames.py rename to prjxray/test_fasm2frames.py index 931bb592..8e278601 100755 --- a/utils/test_fasm2frames.py +++ b/prjxray/test_fasm2frames.py @@ -17,8 +17,7 @@ import re import unittest import tempfile -import prjxray -import utils.fasm2frames as fasm2frames +import prjxray.fasm2frames as fasm2frames from textx.exceptions import TextXSyntaxError diff --git a/setup.py b/setup.py index d45b1b33..8b387c74 100644 --- a/setup.py +++ b/setup.py @@ -23,12 +23,12 @@ setuptools.setup( long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/SymbiFlow/prjxray", - packages=['prjxray', 'utils'], + packages=['prjxray'], classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: ISC License", "Operating System :: OS Independent", ], entry_points={ - 'console_scripts': ['fasm2frames=utils.fasm2frames:main'], + 'console_scripts': ['fasm2frames=prjxray.fasm2frames:main'], }) diff --git a/utils/environment.sh b/utils/environment.sh index 40ce83af..2d248281 100644 --- a/utils/environment.sh +++ b/utils/environment.sh @@ -15,6 +15,7 @@ done export XRAY_UTILS_DIR="$( cd -P "$( dirname "$XRAY_ENV_PATH" )" && pwd )" export XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )" export XRAY_DATABASE_DIR="${XRAY_DIR}/database" +export XRAY_PRJXRAY_DIR="${XRAY_DIR}/prjxray" export XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools" export XRAY_FUZZERS_DIR="${XRAY_DIR}/fuzzers" export XRAY_FAMILY_DIR="${XRAY_DATABASE_DIR}/${XRAY_DATABASE}" @@ -36,7 +37,7 @@ export XRAY_MASKMERGE="bash ${XRAY_UTILS_DIR}/maskmerge.sh" export XRAY_SEGMATCH="${XRAY_TOOLS_DIR}/segmatch" export XRAY_SEGPRINT="python3 ${XRAY_UTILS_DIR}/segprint.py" export XRAY_BIT2FASM="python3 ${XRAY_UTILS_DIR}/bit2fasm.py" -export XRAY_FASM2FRAMES="python3 ${XRAY_UTILS_DIR}/fasm2frames.py" +export XRAY_FASM2FRAMES="python3 ${XRAY_PRJXRAY_DIR}/fasm2frames.py" export XRAY_BITTOOL="${XRAY_TOOLS_DIR}/bittool" export XRAY_BLOCKWIDTH="python3 ${XRAY_UTILS_DIR}/blockwidth.py" export XRAY_PARSEDB="python3 ${XRAY_UTILS_DIR}/parsedb.py"