dfttest2 10.dev0__tar.gz → 11.0.0__tar.gz

{dfttest2-10.dev0 → dfttest2-11.0.0}/.gitignore

@@ -263,6 +263,7 @@ __marimo__/
 build/
 Build/
 build-*/
+build_*/
 
 # CMake generated files
 CMakeFiles/
@@ -287,3 +288,16 @@ vcpkg_installed/
 # test output & cache
 Testing/
 .cache/
+
+# Node.js
+node_modules/
+# Custom distributions
+ncnn-dist/
+onnx-dist/
+onnxruntime-dist/
+openvino-dist/
+TensorRT-*/
+TensorRT-RTX-*/
+
+# JET files
+.vsjet

{dfttest2-10.dev0 → dfttest2-11.0.0}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: dfttest2
-Version: 10.dev0
-Summary: DFTTest re-implemetation
-Project-URL: Source Code, https://github.com/AmusementClub/vs-dfttest2
-Project-URL: Bug Tracker, https://github.com/AmusementClub/vs-dfttest2/issues
+Version: 11.0.0
+Summary: DFTTest re-implementation
+Project-URL: Source Code, https://github.com/Ichunjo/vs-dfttest2
+Project-URL: Bug Tracker, https://github.com/Ichunjo/vs-dfttest2/issues
 Project-URL: Repository, https://github.com/Jaded-Encoding-Thaumaturgy/vs-wheels
 Author: WolframRhodium
 Maintainer-email: Vardë <ichunjo.le.terrible@gmail.com>
@@ -11,8 +11,24 @@ License-Expression: GPL-3.0-or-later
 License-File: vs-dfttest2/LICENSE
 Requires-Python: >=3.12
 Requires-Dist: vapoursynth>=75
+Provides-Extra: cpu
+Requires-Dist: vapoursynth-dfttest2-cpu>=11.0.0; extra == 'cpu'
+Provides-Extra: cuda
+Requires-Dist: vapoursynth-dfttest2-cuda>=11.0.0; extra == 'cuda'
+Requires-Dist: vapoursynth-dfttest2-nvrtc>=11.0.0; extra == 'cuda'
+Provides-Extra: cufft
+Requires-Dist: vapoursynth-dfttest2-cuda>=11.0.0; extra == 'cufft'
 Provides-Extra: gcc
-Requires-Dist: vapoursynth-dfttest2-gcc; extra == 'gcc'
+Requires-Dist: vapoursynth-dfttest2-gcc>=11.0.0; extra == 'gcc'
+Provides-Extra: hip
+Requires-Dist: vapoursynth-dfttest2-hip>=11.0.0; extra == 'hip'
+Requires-Dist: vapoursynth-dfttest2-hiprtc>=11.0.0; extra == 'hip'
+Provides-Extra: hipfft
+Requires-Dist: vapoursynth-dfttest2-hip>=11.0.0; extra == 'hipfft'
+Provides-Extra: hiprtc
+Requires-Dist: vapoursynth-dfttest2-hiprtc>=11.0.0; extra == 'hiprtc'
+Provides-Extra: nvrtc
+Requires-Dist: vapoursynth-dfttest2-nvrtc>=11.0.0; extra == 'nvrtc'
 Description-Content-Type: text/markdown
 
 # dfttest2
@@ -64,24 +80,13 @@ README.md from parent project
 
 ---
 # vs-dfttest2
-DFTTest re-implemetation (CUDA and x86)
+DFTTest re-implementation (GPU and CPU)
 
 ## Usage
 ```python3
 from dfttest2 import DFTTest
+
 output = DFTTest(input)
 ```
 
 See also [VapourSynth-DFTTest](https://github.com/HomeOfVapourSynthEvolution/VapourSynth-DFTTest)
-
-## Compilation
-```bash
-# additional options: -D ENABLE_CUDA=ON -D ENABLE_CPU=ON
-cmake -S . -B build
-
-cmake --build build
-
-cmake --install build
-```
-
-If the vapoursynth library cannot be found by pkg-config, then the cmake variable `VS_INCLUDE_DIR` should be set.

{dfttest2-10.dev0 → dfttest2-11.0.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "dfttest2"
 dynamic = ["version", "readme"]
-description = "DFTTest re-implemetation"
+description = "DFTTest re-implementation"
 license = "GPL-3.0-or-later"
 license-files = ["vs-dfttest2/LICENSE"]
 requires-python = ">=3.12"
@@ -14,14 +14,14 @@ maintainers = [{ name = "Vardë", email = "ichunjo.le.terrible@gmail.com" }]
 dependencies = ["vapoursynth>=75"]
 
 [project.optional-dependencies]
-# cuda = ["vapoursynth-dfttest2_cuda", "vapoursynth-dfttest2_nvrtc"]
-# hip = ["vapoursynth-dfttest2_hip", "vapoursynth-dfttest2_hiprtc"]
-# cufft = ["vapoursynth-dfttest2_cuda"]
-# nvrtc = ["vapoursynth-dfttest2_nvrtc"]
-# hipfft = ["vapoursynth-dfttest2_hip"]
-# hiprtc = ["vapoursynth-dfttest2_hiprtc"]
-# cpu = ["vapoursynth-dfttest2_cpu"]
-gcc = ["vapoursynth-dfttest2-gcc"]
+cuda = ["vapoursynth-dfttest2_cuda>=11.0.0", "vapoursynth-dfttest2_nvrtc>=11.0.0"]
+hip = ["vapoursynth-dfttest2_hip>=11.0.0", "vapoursynth-dfttest2_hiprtc>=11.0.0"]
+cufft = ["vapoursynth-dfttest2_cuda>=11.0.0"]
+nvrtc = ["vapoursynth-dfttest2_nvrtc>=11.0.0"]
+hipfft = ["vapoursynth-dfttest2_hip>=11.0.0"]
+hiprtc = ["vapoursynth-dfttest2_hiprtc>=11.0.0"]
+cpu = ["vapoursynth-dfttest2_cpu>=11.0.0"]
+gcc = ["vapoursynth-dfttest2-gcc>=11.0.0"]
 
 # windows = ["dfttest2[cuda,hip,gcc,cpu]"]
 # linux = [
@@ -34,26 +34,26 @@ gcc = ["vapoursynth-dfttest2-gcc"]
 # ]
 
 [project.urls]
-"Source Code" = "https://github.com/AmusementClub/vs-dfttest2"
-"Bug Tracker" = "https://github.com/AmusementClub/vs-dfttest2/issues"
+"Source Code" = "https://github.com/Ichunjo/vs-dfttest2"
+"Bug Tracker" = "https://github.com/Ichunjo/vs-dfttest2/issues"
 "Repository" = "https://github.com/Jaded-Encoding-Thaumaturgy/vs-wheels"
 
 [tool.hatch.version]
 source = "vcs"
-tag-pattern = '^v(?P<version>.*)$'
+tag-pattern = '^v(?P<version>\d+.*)$'
 
 [tool.hatch.version.raw-options]
 root = "vs-dfttest2"
 local_scheme = "no-local-version"
 
 [tool.hatch.build.targets.sdist]
-include = ["dfttest2", "vs-dfttest2"]
+include = ["vs-dfttest2"]
 
 [tool.hatch.build.targets.wheel]
-include = ["dfttest2"]
+include = ["vs-dfttest2/python"]
 
-[tool.hatch.build.targets.wheel.force-include]
-"vs-dfttest2/dfttest2.py" = "dfttest2/_dfttest2.py"
+[tool.hatch.build.targets.wheel.sources]
+"vs-dfttest2/python" = "dfttest2"
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
 content-type = "text/markdown"
@@ -61,3 +61,8 @@ fragments = [{ path = "README.md" }, { path = "vs-dfttest2/README.md" }]
 
 [tool.uv.sources]
 vapoursynth-dfttest2-gcc = { workspace = true }
+vapoursynth-dfttest2-cpu = { workspace = true }
+vapoursynth-dfttest2-cuda = { workspace = true }
+vapoursynth-dfttest2-nvrtc = { workspace = true }
+vapoursynth-dfttest2-hip = { workspace = true }
+vapoursynth-dfttest2-hiprtc = { workspace = true }

dfttest2-11.0.0/vs-dfttest2/.clang-format

@@ -0,0 +1,27 @@
+---
+BasedOnStyle: LLVM
+IndentWidth: 4
+TabWidth: 4
+ContinuationIndentWidth: 4
+ColumnLimit: 120
+
+# Custom wrapping & alignment overrides
+AlignAfterOpenBracket: BlockIndent
+BinPackParameters: false
+BinPackArguments: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowAllParametersOfDeclarationOnNextLine: false
+IncludeBlocks: Regroup
+PointerAlignment: Left
+ReferenceAlignment: Left
+SortIncludes: CaseSensitive
+IncludeCategories:
+  - Regex: '^<windows\.h>'
+    Priority: 1
+  - Regex: '^<delayimp\.h>'
+    Priority: 2
+  - Regex: '^<.*'
+    Priority: 3
+  - Regex: '.*'
+    Priority: 4
+...

dfttest2-11.0.0/vs-dfttest2/.gitignore

@@ -0,0 +1,289 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[codz]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#   Usually these files are written by a python script from a template
+#   before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py.cover
+*.lcov
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+# Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+# uv.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+# poetry.lock
+# poetry.toml
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#   pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
+#   https://pdm-project.org/en/latest/usage/project/#working-with-version-control
+# pdm.lock
+# pdm.toml
+.pdm-python
+.pdm-build/
+
+# pixi
+#   Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
+# pixi.lock
+#   Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
+#   in the .venv directory. It is recommended not to include this directory in version control.
+.pixi/*
+!.pixi/config.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule*
+celerybeat.pid
+
+# Redis
+*.rdb
+*.aof
+*.pid
+
+# RabbitMQ
+mnesia/
+rabbitmq/
+rabbitmq-data/
+
+# ActiveMQ
+activemq-data/
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.envrc
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#   JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#   be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#   and can be added to the global gitignore or merged into this file.  For a more nuclear
+#   option (not recommended) you can uncomment the following to ignore the entire idea folder.
+# .idea/
+
+# Abstra
+#   Abstra is an AI-powered process automation framework.
+#   Ignore directories containing user credentials, local state, and settings.
+#   Learn more at https://abstra.io/docs
+.abstra/
+
+# Visual Studio Code
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore that
+#   can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, you
+#   could uncomment the following to ignore the entire vscode folder
+# .vscode/
+# Temporary file for partial code execution
+tempCodeRunnerFile.py
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# Marimo
+marimo/_static/
+marimo/_lsp/
+__marimo__/
+
+# Streamlit
+.streamlit/secrets.toml
+
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Linker files
+*.ilk
+
+# Debugger Files
+*.pdb
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+*.so.*
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Build directories
+build/
+Build/
+build-*/
+
+# CMake generated files
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+Makefile
+install_manifest.txt
+compile_commands.json
+
+# Temporary files
+*.tmp
+*.log
+*.bak
+*.swp
+
+# vcpkg
+vcpkg_installed/
+
+# debug information files
+*.dwo
+
+# test output & cache
+Testing/
+.cache/

dfttest2-11.0.0/vs-dfttest2/README.md

@@ -0,0 +1,11 @@
+# vs-dfttest2
+DFTTest re-implementation (GPU and CPU)
+
+## Usage
+```python3
+from dfttest2 import DFTTest
+
+output = DFTTest(input)
+```
+
+See also [VapourSynth-DFTTest](https://github.com/HomeOfVapourSynthEvolution/VapourSynth-DFTTest)

{dfttest2-10.dev0 → dfttest2-11.0.0}/vs-dfttest2/cpu_source/cpu_dispatch.h.in

@@ -3,7 +3,7 @@
 #ifndef CPU_DISPATCH_H
 #define CPU_DISPATCH_H
 
-#include <VapourSynth.h>
+#include <VapourSynth4.h>
 
 @GETFRAME_DECLARATIONS@
 

dfttest2-11.0.0/vs-dfttest2/cpu_source/dfttest2_cpu.h

@@ -0,0 +1,62 @@
+#ifndef DFTTEST2_CPU_H
+#define DFTTEST2_CPU_H
+
+#include <VSHelper4.h>
+#include <VapourSynth4.h>
+#include <array>
+#include <atomic>
+#include <cstdint>
+#include <memory>
+#include <shared_mutex>
+#include <thread>
+#include <unordered_map>
+#include <vectorclass.h>
+
+static inline void vs_aligned_free_float(float* ptr) {
+    vsh::vsh_aligned_free(static_cast<void*>(ptr));
+}
+
+struct DFTTestThreadData {
+    uint8_t* padded; // shape: (pad_height, pad_width)
+    float* padded2;  // shape: (pad_height, pad_width)
+};
+
+struct DFTTestData {
+    VSNode* node;
+    int radius;
+    int block_size;
+    int block_step;
+    std::array<bool, 3> process;
+    bool zero_mean;
+    std::unique_ptr<float[], decltype(&vs_aligned_free_float)> window{nullptr, &vs_aligned_free_float};
+    std::unique_ptr<float[], decltype(&vs_aligned_free_float)> window_freq{nullptr, &vs_aligned_free_float};
+    std::unique_ptr<float[], decltype(&vs_aligned_free_float)> sigma{nullptr, &vs_aligned_free_float};
+    int filter_type;
+    float sigma2;
+    float pmin;
+    float pmax;
+
+    std::atomic<int> num_uninitialized_threads;
+    std::unordered_map<std::thread::id, DFTTestThreadData> thread_data;
+    std::shared_mutex thread_data_lock;
+};
+
+#if defined HAS_DISPATCH
+#include <cpu_dispatch.h>
+#else  // HAS_DISPATCH
+extern const VSFrame* VS_CC DFTTestGetFrame(
+    int n,
+    int activationReason,
+    void* instanceData,
+    void** frameData,
+    VSFrameContext* frameCtx,
+    VSCore* core,
+    const VSAPI* vsapi
+) noexcept;
+
+extern bool supported_arch() noexcept;
+
+extern const char* target_arch() noexcept;
+#endif // HAS_DISPATCH
+
+#endif // DFTTEST2_CPU_H