Remove pybind dependencies from RaggedArc. (#842)

* Convert py::object and torch::IValue to each other * Remove py::object from RaggedAny * Remove py::object from RaggedArc * Move files to torch directory * remove unused files * Add unit tests * Remove v2 folder * Remove unused code * Remove unused files * Fix review comments & fix github actions * Check Ivalue contains RaggedAny * Minor fixes * Add attributes related unit test for FsaClass * Fix mutable_grad in older pytorch version * Fix github actions * Fix github action PYTHONPATH * Fix github action PYTHONPATH * Link pybind11::embed * import torch first (to fix macos github actions) * try to fix macos ci
k2-fsa · Oct 27, 2021 · daa98e7 · daa98e7
1 parent 08198a9
commit daa98e7
Show file tree

Hide file tree

Showing 75 changed files with 2,065 additions and 1,757 deletions.
diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml
@@ -88,7 +88,7 @@ jobs:
       - name: Build doc
         shell: bash
         run: |
-          export PYTHONPATH=$PWD/k2/python:$PWD/build/lib:$PYTHONPATH
+          export PYTHONPATH=$PWD/k2/torch/python:$PWD/build/lib:$PYTHONPATH
           echo "PYTHONPATH: $PYTHONPATH"
           cd docs
           python3 -m pip install -r ./requirements.txt

diff --git a/.github/workflows/run-tests-cpu.yml b/.github/workflows/run-tests-cpu.yml
@@ -105,12 +105,13 @@ jobs:
       - name: Display Build Information
         shell: bash
         run: |
-          export PYTHONPATH=$PWD/k2/python:$PWD/build/lib:$PYTHONPATH
+          export PYTHONPATH=$PWD/k2/torch/python:$PWD/build/lib:$PYTHONPATH
           python3 -m k2.version
 
       - name: Run Tests
         shell: bash
         run: |
+          export PYTHONPATH=$PWD/k2/torch/python:$PWD/build/lib:$PYTHONPATH
           cd build
           ctest --output-on-failure
           # default log level is INFO

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -118,12 +118,13 @@ jobs:
       - name: Display Build Information
         shell: bash
         run: |
-          export PYTHONPATH=$PWD/k2/python:$PWD/build/lib:$PYTHONPATH
+          export PYTHONPATH=$PWD/k2/torch/python:$PWD/build/lib:$PYTHONPATH
           python3 -m k2.version
 
       - name: Run Tests
         shell: bash
         run: |
+          export PYTHONPATH=$PWD/k2/torch/python:$PWD/build/lib:$PYTHONPATH
           cd build
           ctest --output-on-failure
           # default log level is INFO

diff --git a/k2/CMakeLists.txt b/k2/CMakeLists.txt
@@ -1,2 +1,6 @@
 add_subdirectory(csrc)
-add_subdirectory(python)
+if(K2_USE_PYTORCH)
+  add_subdirectory(torch)
+else()
+  message(FATAL_ERROR "Please select a framework.")
+endif()
diff --git a/k2/python/csrc/k2.cu b/k2/python/csrc/k2.cu
diff --git a/k2/python/csrc/torch.cu b/k2/python/csrc/torch.cu
diff --git a/k2/python/csrc/torch/v2/README.md b/k2/python/csrc/torch/v2/README.md
diff --git a/k2/python/csrc/torch/v2/autograd/arc_sort.h b/k2/python/csrc/torch/v2/autograd/arc_sort.h
diff --git a/k2/python/csrc/torch/v2/autograd/ragged_arc_holder.h b/k2/python/csrc/torch/v2/autograd/ragged_arc_holder.h
diff --git a/k2/python/csrc/torch/v2/fsa.cu b/k2/python/csrc/torch/v2/fsa.cu