Rearrange project files #7

jurihock · Jun 14, 2023 · 871a886 · 871a886
1 parent 6d0bdce
commit 871a886
Show file tree

Hide file tree

Showing 31 changed files with 9 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -75,9 +75,9 @@ Feel free to obtain current version from [PyPI](https://pypi.org/project/qdft) b
 
 | QDFT | Chroma12 |
 | :--: | :------: |
-| ![SDFT](https://github.com/jurihock/qdft/raw/main/examples/face.png) | ![STFT](https://github.com/jurihock/qdft/raw/main/examples/cmajor.png) |
-| [face.py](https://github.com/jurihock/qdft/blob/main/examples/face.py) | [cmajor.py](https://github.com/jurihock/qdft/blob/main/examples/cmajor.py) |
-| ![SDFT](https://github.com/jurihock/qdft/raw/main/examples/face.wav.png) | ![STFT](https://github.com/jurihock/qdft/raw/main/examples/cmajor.wav.png) |
+| ![SDFT](https://github.com/jurihock/qdft/raw/main/python/examples/face.png) | ![STFT](https://github.com/jurihock/qdft/raw/main/python/examples/cmajor.png) |
+| [face.py](https://github.com/jurihock/qdft/blob/main/python/examples/face.py) | [cmajor.py](https://github.com/jurihock/qdft/blob/main/python/examples/cmajor.py) |
+| ![SDFT](https://github.com/jurihock/qdft/raw/main/python/examples/face.wav.png) | ![STFT](https://github.com/jurihock/qdft/raw/main/python/examples/cmajor.wav.png) |
 
 ## See also
 

diff --git a/CMakeLists.txt → cpp/CMakeLists.txt b/CMakeLists.txt → cpp/CMakeLists.txt
@@ -8,13 +8,9 @@ else()
   # add_compile_options(-Wall -Werror)
 endif()
 
-# include("${CMAKE_CURRENT_LIST_DIR}/src/c/qdft/CMakeLists.txt")
-include("${CMAKE_CURRENT_LIST_DIR}/src/cpp/qdft/CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/src/qdft/CMakeLists.txt")
 
 include("${CMAKE_CURRENT_LIST_DIR}/lib/cpm.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/lib/dr.cmake")
-# include("${CMAKE_CURRENT_LIST_DIR}/test/CMakeLists.txt")
-
 include("${CMAKE_CURRENT_LIST_DIR}/lib/python.cmake")
 
 if(Python3_FOUND AND Python3_NumPy_FOUND)

diff --git a/examples/CMakeLists.txt → cpp/examples/CMakeLists.txt b/examples/CMakeLists.txt → cpp/examples/CMakeLists.txt
diff --git a/examples/analysis.cmake → cpp/examples/analysis.cmake b/examples/analysis.cmake → cpp/examples/analysis.cmake
diff --git a/examples/analysis.cpp → cpp/examples/analysis.cpp b/examples/analysis.cpp → cpp/examples/analysis.cpp
diff --git a/lib/cpm.cmake → cpp/lib/cpm.cmake b/lib/cpm.cmake → cpp/lib/cpm.cmake
diff --git a/lib/matplotlibcpp.cmake → cpp/lib/matplotlibcpp.cmake b/lib/matplotlibcpp.cmake → cpp/lib/matplotlibcpp.cmake
diff --git a/lib/numcpp.cmake → cpp/lib/numcpp.cmake b/lib/numcpp.cmake → cpp/lib/numcpp.cmake
diff --git a/lib/pybind.cmake → cpp/lib/pybind.cmake b/lib/pybind.cmake → cpp/lib/pybind.cmake
diff --git a/lib/python.cmake → cpp/lib/python.cmake b/lib/python.cmake → cpp/lib/python.cmake
diff --git a/src/cpp/qdft/CMakeLists.txt → cpp/src/qdft/CMakeLists.txt b/src/cpp/qdft/CMakeLists.txt → cpp/src/qdft/CMakeLists.txt
diff --git a/src/cpp/qdft/qdft.h → cpp/src/qdft/qdft.h b/src/cpp/qdft/qdft.h → cpp/src/qdft/qdft.h
diff --git a/lib/dr.cmake b/lib/dr.cmake
diff --git a/Makefile → python/Makefile b/Makefile → python/Makefile
diff --git a/examples/analysis.py → python/examples/analysis.py b/examples/analysis.py → python/examples/analysis.py
@@ -1,5 +1,5 @@
 import os, sys
-src = os.path.join(os.path.dirname(__file__), '..', 'src', 'python')
+src = os.path.join(os.path.dirname(__file__), '..', 'src')
 sys.path.insert(0, src)
 
 from qdft import QDFT

diff --git a/examples/cent.py → python/examples/cent.py b/examples/cent.py → python/examples/cent.py
@@ -1,5 +1,5 @@
 import os, sys
-src = os.path.join(os.path.dirname(__file__), '..', 'src', 'python')
+src = os.path.join(os.path.dirname(__file__), '..', 'src')
 sys.path.insert(0, src)
 
 from qdft import Chroma, Scale

diff --git a/examples/cmajor.png → python/examples/cmajor.png b/examples/cmajor.png → python/examples/cmajor.png
diff --git a/examples/cmajor.py → python/examples/cmajor.py b/examples/cmajor.py → python/examples/cmajor.py
@@ -1,5 +1,5 @@
 import os, sys
-src = os.path.join(os.path.dirname(__file__), '..', 'src', 'python')
+src = os.path.join(os.path.dirname(__file__), '..', 'src')
 sys.path.insert(0, src)
 
 from qdft import Chroma12

diff --git a/examples/cmajor.wav → python/examples/cmajor.wav b/examples/cmajor.wav → python/examples/cmajor.wav
diff --git a/examples/cmajor.wav.png → python/examples/cmajor.wav.png b/examples/cmajor.wav.png → python/examples/cmajor.wav.png
diff --git a/examples/face.png → python/examples/face.png b/examples/face.png → python/examples/face.png
diff --git a/examples/face.py → python/examples/face.py b/examples/face.py → python/examples/face.py
@@ -1,5 +1,5 @@
 import os, sys
-src = os.path.join(os.path.dirname(__file__), '..', 'src', 'python')
+src = os.path.join(os.path.dirname(__file__), '..', 'src')
 sys.path.insert(0, src)
 
 from qdft import QDFT

diff --git a/examples/face.wav → python/examples/face.wav b/examples/face.wav → python/examples/face.wav
diff --git a/examples/face.wav.png → python/examples/face.wav.png b/examples/face.wav.png → python/examples/face.wav.png
diff --git a/pyproject.toml → python/pyproject.toml b/pyproject.toml → python/pyproject.toml
diff --git a/setup.cfg → python/setup.cfg b/setup.cfg → python/setup.cfg
@@ -53,7 +53,7 @@ classifiers =
 
 [options]
 package_dir=
-    = src/python
+    = src
 packages =
     qdft
 python_requires =

diff --git a/src/python/qdft/__init__.py → python/src/qdft/__init__.py b/src/python/qdft/__init__.py → python/src/qdft/__init__.py
diff --git a/src/python/qdft/chroma.py → python/src/qdft/chroma.py b/src/python/qdft/chroma.py → python/src/qdft/chroma.py
diff --git a/src/python/qdft/fafe.py → python/src/qdft/fafe.py b/src/python/qdft/fafe.py → python/src/qdft/fafe.py
diff --git a/src/python/qdft/qdft.py → python/src/qdft/qdft.py b/src/python/qdft/qdft.py → python/src/qdft/qdft.py
diff --git a/src/python/qdft/scale.py → python/src/qdft/scale.py b/src/python/qdft/scale.py → python/src/qdft/scale.py