use src-layout (fix #12)

punica-ai · Nov 22, 2023 · eb3cd4d · eb3cd4d
1 parent 0d12336
commit eb3cd4d
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 22 deletions.
diff --git a/.github/workflows/gpu-test.yml b/.github/workflows/gpu-test.yml
@@ -15,6 +15,7 @@ on:
 jobs:
   gpu-test:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - { arch: sm80, torch: "2.1.0", cuda_major: 12, cuda_minor: 1 }
@@ -36,7 +37,7 @@ jobs:
               -e PUNICA_CI_CUDA_MAJOR=${{ matrix.cuda_major }} \
               -e PUNICA_CI_CUDA_MINOR=${{ matrix.cuda_minor }} \
               --user $CI_UID:$CI_GID \
-              nvidia/cuda:12.1.0-devel-ubuntu22.04 \
+              nvidia/cuda:${{ matrix.cuda_major }}.${{ matrix.cuda_minor }}.0-devel-ubuntu22.04 \
               bash /app/ci/run-ci-gpu-tests.bash
 
       - name: Upload coverage to Codecov

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,6 @@ recursive-include csrc *
 recursive-include third_party/cutlass/include *
 prune benchmarks
 
+recursive-include licenses *
 prune */__pycache__
 global-exclude *.so
diff --git a/ci/run-ci-gpu-tests.bash b/ci/run-ci-gpu-tests.bash
@@ -41,11 +41,10 @@ echo "::endgroup::"
 echo "::group::Install Punica"
 cd "$PROJECT_ROOT"
 pip install ninja numpy
-# pip install -v --no-build-isolation .[dev]
-pip install -v -e .[dev]
+pip install -v --no-build-isolation -e .[dev]
 echo "::endgroup::"
 
 
 echo "::group::Punica pytest"
-pytest --cov=punica --cov-report=xml
+pytest --cov=src --cov-report=xml
 echo "::endgroup::"
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,23 +28,6 @@ dev = [
     "textual",
 ]
 
-[tool.setuptools.packages.find]
-include = ["punica*"]
-exclude = [
-    "assets",
-    "benchmarks",
-    "csrc",
-    "data",
-    "dist",
-    "examples",
-    "test",
-    "third_party",
-    "tmp",
-    "*__pycache__*",
-]
-namespaces = false
-
-
 [tool.yapf]
 based_on_style = "yapf"
 

diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@ def remove_unwanted_pytorch_nvcc_flags():
     ))
 
 setuptools.setup(
-    version=get_version(root / "punica/__init__.py"),
+    version=get_version(root / "src/punica/__init__.py"),
     ext_modules=ext_modules,
     cmdclass={"build_ext": torch_cpp_ext.BuildExtension},
 )
diff --git a/punica/__init__.py → src/punica/__init__.py b/punica/__init__.py → src/punica/__init__.py
diff --git a/punica/models/__init__.py → src/punica/models/__init__.py b/punica/models/__init__.py → src/punica/models/__init__.py
diff --git a/punica/models/llama.py → src/punica/models/llama.py b/punica/models/llama.py → src/punica/models/llama.py
diff --git a/punica/models/llama_lora.py → src/punica/models/llama_lora.py b/punica/models/llama_lora.py → src/punica/models/llama_lora.py
diff --git a/punica/ops/__init__.py → src/punica/ops/__init__.py b/punica/ops/__init__.py → src/punica/ops/__init__.py
diff --git a/punica/utils/__init__.py → src/punica/utils/__init__.py b/punica/utils/__init__.py → src/punica/utils/__init__.py
diff --git a/punica/utils/cat_tensor.py → src/punica/utils/cat_tensor.py b/punica/utils/cat_tensor.py → src/punica/utils/cat_tensor.py
diff --git a/punica/utils/convert_lora_weight.py → src/punica/utils/convert_lora_weight.py b/punica/utils/convert_lora_weight.py → src/punica/utils/convert_lora_weight.py
diff --git a/punica/utils/kvcache.py → src/punica/utils/kvcache.py b/punica/utils/kvcache.py → src/punica/utils/kvcache.py
diff --git a/punica/utils/lora.py → src/punica/utils/lora.py b/punica/utils/lora.py → src/punica/utils/lora.py