From f6fdc96c6de3907d715371eca1abd958fd9680b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Tue, 13 Dec 2022 10:15:31 +0100 Subject: [PATCH] Refactor project structure --- .gitmodules | 2 +- MANIFEST.in | 1 - Makefile | 5 ++--- samples/sample.cpp | 4 ++-- samples/sample.py | 2 +- setup.py | 4 ++-- src/{fimdlp => }/cppmdlp/.gitignore | 0 src/{fimdlp => }/cppmdlp/CMakeLists.txt | 0 src/{fimdlp => }/cppmdlp/CPPFImdlp.cpp | 0 src/{fimdlp => }/cppmdlp/CPPFImdlp.h | 0 src/{fimdlp => }/cppmdlp/LICENSE | 0 src/{fimdlp => }/cppmdlp/Metrics.cpp | 0 src/{fimdlp => }/cppmdlp/Metrics.h | 0 src/{fimdlp => }/cppmdlp/README.md | 0 src/{fimdlp => }/cppmdlp/sample/ArffFiles.cpp | 0 src/{fimdlp => }/cppmdlp/sample/ArffFiles.h | 0 src/{fimdlp => }/cppmdlp/sample/CMakeLists.txt | 0 src/{fimdlp => }/cppmdlp/sample/sample.cpp | 0 src/{fimdlp => }/cppmdlp/tests/.gitignore | 0 src/{fimdlp => }/cppmdlp/tests/CMakeLists.txt | 0 src/{fimdlp => }/cppmdlp/tests/FImdlp_unittest.cpp | 0 src/{fimdlp => }/cppmdlp/tests/Metrics_unittest.cpp | 0 src/{fimdlp => }/cppmdlp/tests/cover | 0 src/{fimdlp => }/cppmdlp/tests/datasets/iris.arff | 0 .../cppmdlp/tests/datasets/kdd_JapaneseVowels.arff | 0 src/{fimdlp => }/cppmdlp/tests/datasets/letter.arff | 0 src/{fimdlp => }/cppmdlp/tests/datasets/mfeat-factors.arff | 0 src/{fimdlp => }/cppmdlp/tests/test | 0 src/{fimdlp => }/cppmdlp/typesFImdlp.h | 0 src/fimdlp/cfimdlp.pyx | 2 +- 30 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 MANIFEST.in rename src/{fimdlp => }/cppmdlp/.gitignore (100%) rename src/{fimdlp => }/cppmdlp/CMakeLists.txt (100%) rename src/{fimdlp => }/cppmdlp/CPPFImdlp.cpp (100%) rename src/{fimdlp => }/cppmdlp/CPPFImdlp.h (100%) rename src/{fimdlp => }/cppmdlp/LICENSE (100%) rename src/{fimdlp => }/cppmdlp/Metrics.cpp (100%) rename src/{fimdlp => }/cppmdlp/Metrics.h (100%) rename src/{fimdlp => }/cppmdlp/README.md (100%) rename src/{fimdlp => }/cppmdlp/sample/ArffFiles.cpp (100%) rename src/{fimdlp => }/cppmdlp/sample/ArffFiles.h (100%) rename src/{fimdlp => }/cppmdlp/sample/CMakeLists.txt (100%) rename src/{fimdlp => }/cppmdlp/sample/sample.cpp (100%) rename src/{fimdlp => }/cppmdlp/tests/.gitignore (100%) rename src/{fimdlp => }/cppmdlp/tests/CMakeLists.txt (100%) rename src/{fimdlp => }/cppmdlp/tests/FImdlp_unittest.cpp (100%) rename src/{fimdlp => }/cppmdlp/tests/Metrics_unittest.cpp (100%) rename src/{fimdlp => }/cppmdlp/tests/cover (100%) rename src/{fimdlp => }/cppmdlp/tests/datasets/iris.arff (100%) rename src/{fimdlp => }/cppmdlp/tests/datasets/kdd_JapaneseVowels.arff (100%) rename src/{fimdlp => }/cppmdlp/tests/datasets/letter.arff (100%) rename src/{fimdlp => }/cppmdlp/tests/datasets/mfeat-factors.arff (100%) rename src/{fimdlp => }/cppmdlp/tests/test (100%) rename src/{fimdlp => }/cppmdlp/typesFImdlp.h (100%) diff --git a/.gitmodules b/.gitmodules index 1ca7100..e488052 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "fimdlp/cppmdlp"] - path = fimdlp/cppmdlp + path = src/cppfimdlp url = https://github.com/rmontanana/mdlp diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 7556747..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include fimdlp/cppmdlp/CPPFImdlp.h diff --git a/Makefile b/Makefile index 633ac30..de439c7 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,9 @@ build: ## Build package make clean python -m build --wheel -buildext: ## Build extension +install: ## Build extension make clean - python setup.py build_ext - echo "Build extension success" + pip install -e . audit: ## Audit pip pip-audit diff --git a/samples/sample.cpp b/samples/sample.cpp index c1c9bf6..d838bb9 100644 --- a/samples/sample.cpp +++ b/samples/sample.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "../src/fimdlp/cppmdlp/CPPFImdlp.h" +#include "../src/cppmdlp/CPPFImdlp.h" using namespace std; @@ -10,7 +10,7 @@ int main(int argc, char** argv) { ArffFiles file; vector lines; - string path = "../../src/fimdlp/cppmdlp/tests/datasets/"; + string path = "../../src/cppmdlp/tests/datasets/"; map datasets = { {"mfeat-factors", true}, {"iris", true}, diff --git a/samples/sample.py b/samples/sample.py index 08b747f..e7f5fca 100644 --- a/samples/sample.py +++ b/samples/sample.py @@ -20,7 +20,7 @@ ap.add_argument("dataset", type=str, choices=datasets.keys()) args = ap.parse_args() relative = "" if os.path.isdir("src") else ".." file_name = os.path.join( - relative, "src", "fimdlp", "cppmdlp", "tests", "datasets", args.dataset + relative, "src", "cppmdlp", "tests", "datasets", args.dataset ) data = arff.loadarff(file_name + ".arff") df = pd.DataFrame(data[0]) diff --git a/setup.py b/setup.py index 4269229..db8a696 100644 --- a/setup.py +++ b/setup.py @@ -12,8 +12,8 @@ setup( name="fimdlp.cppfimdlp", sources=[ "src/fimdlp/cfimdlp.pyx", - "src/fimdlp/cppmdlp/CPPFImdlp.cpp", - "src/fimdlp/cppmdlp/Metrics.cpp", + "src/cppmdlp/CPPFImdlp.cpp", + "src/cppmdlp/Metrics.cpp", ], language="c++", include_dirs=["fimdlp"], diff --git a/src/fimdlp/cppmdlp/.gitignore b/src/cppmdlp/.gitignore similarity index 100% rename from src/fimdlp/cppmdlp/.gitignore rename to src/cppmdlp/.gitignore diff --git a/src/fimdlp/cppmdlp/CMakeLists.txt b/src/cppmdlp/CMakeLists.txt similarity index 100% rename from src/fimdlp/cppmdlp/CMakeLists.txt rename to src/cppmdlp/CMakeLists.txt diff --git a/src/fimdlp/cppmdlp/CPPFImdlp.cpp b/src/cppmdlp/CPPFImdlp.cpp similarity index 100% rename from src/fimdlp/cppmdlp/CPPFImdlp.cpp rename to src/cppmdlp/CPPFImdlp.cpp diff --git a/src/fimdlp/cppmdlp/CPPFImdlp.h b/src/cppmdlp/CPPFImdlp.h similarity index 100% rename from src/fimdlp/cppmdlp/CPPFImdlp.h rename to src/cppmdlp/CPPFImdlp.h diff --git a/src/fimdlp/cppmdlp/LICENSE b/src/cppmdlp/LICENSE similarity index 100% rename from src/fimdlp/cppmdlp/LICENSE rename to src/cppmdlp/LICENSE diff --git a/src/fimdlp/cppmdlp/Metrics.cpp b/src/cppmdlp/Metrics.cpp similarity index 100% rename from src/fimdlp/cppmdlp/Metrics.cpp rename to src/cppmdlp/Metrics.cpp diff --git a/src/fimdlp/cppmdlp/Metrics.h b/src/cppmdlp/Metrics.h similarity index 100% rename from src/fimdlp/cppmdlp/Metrics.h rename to src/cppmdlp/Metrics.h diff --git a/src/fimdlp/cppmdlp/README.md b/src/cppmdlp/README.md similarity index 100% rename from src/fimdlp/cppmdlp/README.md rename to src/cppmdlp/README.md diff --git a/src/fimdlp/cppmdlp/sample/ArffFiles.cpp b/src/cppmdlp/sample/ArffFiles.cpp similarity index 100% rename from src/fimdlp/cppmdlp/sample/ArffFiles.cpp rename to src/cppmdlp/sample/ArffFiles.cpp diff --git a/src/fimdlp/cppmdlp/sample/ArffFiles.h b/src/cppmdlp/sample/ArffFiles.h similarity index 100% rename from src/fimdlp/cppmdlp/sample/ArffFiles.h rename to src/cppmdlp/sample/ArffFiles.h diff --git a/src/fimdlp/cppmdlp/sample/CMakeLists.txt b/src/cppmdlp/sample/CMakeLists.txt similarity index 100% rename from src/fimdlp/cppmdlp/sample/CMakeLists.txt rename to src/cppmdlp/sample/CMakeLists.txt diff --git a/src/fimdlp/cppmdlp/sample/sample.cpp b/src/cppmdlp/sample/sample.cpp similarity index 100% rename from src/fimdlp/cppmdlp/sample/sample.cpp rename to src/cppmdlp/sample/sample.cpp diff --git a/src/fimdlp/cppmdlp/tests/.gitignore b/src/cppmdlp/tests/.gitignore similarity index 100% rename from src/fimdlp/cppmdlp/tests/.gitignore rename to src/cppmdlp/tests/.gitignore diff --git a/src/fimdlp/cppmdlp/tests/CMakeLists.txt b/src/cppmdlp/tests/CMakeLists.txt similarity index 100% rename from src/fimdlp/cppmdlp/tests/CMakeLists.txt rename to src/cppmdlp/tests/CMakeLists.txt diff --git a/src/fimdlp/cppmdlp/tests/FImdlp_unittest.cpp b/src/cppmdlp/tests/FImdlp_unittest.cpp similarity index 100% rename from src/fimdlp/cppmdlp/tests/FImdlp_unittest.cpp rename to src/cppmdlp/tests/FImdlp_unittest.cpp diff --git a/src/fimdlp/cppmdlp/tests/Metrics_unittest.cpp b/src/cppmdlp/tests/Metrics_unittest.cpp similarity index 100% rename from src/fimdlp/cppmdlp/tests/Metrics_unittest.cpp rename to src/cppmdlp/tests/Metrics_unittest.cpp diff --git a/src/fimdlp/cppmdlp/tests/cover b/src/cppmdlp/tests/cover similarity index 100% rename from src/fimdlp/cppmdlp/tests/cover rename to src/cppmdlp/tests/cover diff --git a/src/fimdlp/cppmdlp/tests/datasets/iris.arff b/src/cppmdlp/tests/datasets/iris.arff similarity index 100% rename from src/fimdlp/cppmdlp/tests/datasets/iris.arff rename to src/cppmdlp/tests/datasets/iris.arff diff --git a/src/fimdlp/cppmdlp/tests/datasets/kdd_JapaneseVowels.arff b/src/cppmdlp/tests/datasets/kdd_JapaneseVowels.arff similarity index 100% rename from src/fimdlp/cppmdlp/tests/datasets/kdd_JapaneseVowels.arff rename to src/cppmdlp/tests/datasets/kdd_JapaneseVowels.arff diff --git a/src/fimdlp/cppmdlp/tests/datasets/letter.arff b/src/cppmdlp/tests/datasets/letter.arff similarity index 100% rename from src/fimdlp/cppmdlp/tests/datasets/letter.arff rename to src/cppmdlp/tests/datasets/letter.arff diff --git a/src/fimdlp/cppmdlp/tests/datasets/mfeat-factors.arff b/src/cppmdlp/tests/datasets/mfeat-factors.arff similarity index 100% rename from src/fimdlp/cppmdlp/tests/datasets/mfeat-factors.arff rename to src/cppmdlp/tests/datasets/mfeat-factors.arff diff --git a/src/fimdlp/cppmdlp/tests/test b/src/cppmdlp/tests/test similarity index 100% rename from src/fimdlp/cppmdlp/tests/test rename to src/cppmdlp/tests/test diff --git a/src/fimdlp/cppmdlp/typesFImdlp.h b/src/cppmdlp/typesFImdlp.h similarity index 100% rename from src/fimdlp/cppmdlp/typesFImdlp.h rename to src/cppmdlp/typesFImdlp.h diff --git a/src/fimdlp/cfimdlp.pyx b/src/fimdlp/cfimdlp.pyx index 6d92d05..c831389 100644 --- a/src/fimdlp/cfimdlp.pyx +++ b/src/fimdlp/cfimdlp.pyx @@ -3,7 +3,7 @@ from libcpp.vector cimport vector from libcpp cimport bool -cdef extern from "cppmdlp/CPPFImdlp.h" namespace "mdlp": +cdef extern from "../cppmdlp/CPPFImdlp.h" namespace "mdlp": ctypedef float precision_t cdef cppclass CPPFImdlp: CPPFImdlp(bool) except +