Merge branch 'master' into feature/arch_linux_script

acids-ircam · Jun 22, 2023 · 2b45e76 · 2b45e76
2 parents d3017a7 + 7ab3e65
commit 2b45e76
Show file tree

Hide file tree

Showing 39 changed files with 3,062 additions and 314 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,67 +4,135 @@ on:
     tags:
       - "v*"
 jobs:
-  arm64-build:
+  osx-arm64-build:
     runs-on: macos-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v2
       - run: git submodule update --init --recursive
       - name: Setup torch
         run: |
-          curl -L https://anaconda.org/pytorch/pytorch/1.11.0.arm64/download/osx-arm64/pytorch-1.11.0.arm64-py3.9_0.tar.bz2 | tar -xv
+          curl -L https://anaconda.org/pytorch/pytorch/2.0.0/download/osx-arm64/pytorch-2.0.0-py3.10_0.tar.bz2 | tar -xv
+      - name: Setup puredata
+        run: |
+          mkdir puredata_include
+          curl -L https://raw.githubusercontent.com/pure-data/pure-data/master/src/m_pd.h -o puredata_include/m_pd.h
       - name: Build
         run: |
           mkdir build
           cd build
-          cmake ../src -DCMAKE_PREFIX_PATH=${{ github.workspace }}/lib/python3.9/site-packages/torch -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64
+          cmake ../src -DCMAKE_PREFIX_PATH=${{ github.workspace }}/lib/python3.10/site-packages/torch -DCMAKE_BUILD_TYPE=Release -DPUREDATA_INCLUDE_DIR=${{ github.workspace }}/puredata_include -DCMAKE_OSX_ARCHITECTURES=arm64
           make
-      - name: Package creation
+      - name: Max/MSP Package creation
         run: |
           mkdir nn_tilde
           mkdir nn_tilde/help
           mv src/externals nn_tilde
           cp src/frontend/maxmsp/nn_tilde/nn~.maxhelp nn_tilde/help
           tar -czvf nn_max_msp_macOS_arm64.tar.gz nn_tilde
+      - name: PureData Package creation
+        run: |
+          rm -fr nn_tilde
+          mv build/frontend/puredata/nn_tilde .
+          rm -fr nn_tilde/CMakeFiles/ nn_tilde/*.cmake nn_tilde/Makefile
+          tar -czvf nn_puredata_macOS_arm64.tar.gz nn_tilde
       - name: Upload binaries
         uses: actions/upload-artifact@v2
         with:
           name: nn_tilde
-          path: nn_max_msp_macOS_arm64.tar.gz
+          path: |
+            nn_max_msp_macOS_arm64.tar.gz
+            nn_puredata_macOS_arm64.tar.gz
 
-  x86_64-build:
+  osx-x64-build:
     runs-on: macos-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v2
       - run: git submodule update --init --recursive
       - name: Setup torch
         run: |
-          curl -L https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.11.0.zip -o libtorch.zip
+          curl -L https://download.pytorch.org/libtorch/cpu/libtorch-macos-2.0.0.zip -o libtorch.zip
           unzip libtorch.zip
-
+      - name: Setup puredata
+        run: |
+          mkdir puredata_include
+          curl -L https://raw.githubusercontent.com/pure-data/pure-data/master/src/m_pd.h -o puredata_include/m_pd.h
       - name: Build
         run: |
           mkdir build
           cd build
-          cmake ../src -DCMAKE_PREFIX_PATH=${{ github.workspace }}/libtorch -DCMAKE_BUILD_TYPE=Release
+          cmake ../src -DCMAKE_PREFIX_PATH=${{ github.workspace }}/libtorch -DCMAKE_BUILD_TYPE=Release -DPUREDATA_INCLUDE_DIR=${{ github.workspace }}/puredata_include 
           make
-      - name: Package creation
+      - name: Max/MSP Package creation
+        run: |
+          mkdir nn_tilde
+          mkdir nn_tilde/help
+          mv src/externals nn_tilde
+          cp src/frontend/maxmsp/nn_tilde/nn~.maxhelp nn_tilde/help
+          tar -czvf nn_max_msp_macOS_x64.tar.gz nn_tilde
+      - name: PureData Package creation
+        run: |
+          rm -fr nn_tilde
+          mv build/frontend/puredata/nn_tilde .
+          rm -fr nn_tilde/CMakeFiles/ nn_tilde/*.cmake nn_tilde/Makefile
+          tar -czvf nn_puredata_macOS_x64.tar.gz nn_tilde
+      - name: Upload binaries
+        uses: actions/upload-artifact@v2
+        with:
+          name: nn_tilde
+          path: |
+            nn_max_msp_macOS_x64.tar.gz
+            nn_puredata_macOS_x64.tar.gz
+
+  windows-x64-build:
+    runs-on: windows-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - run: git submodule update --init --recursive
+      - name: Setup torch
+        run: |
+          curl -L https://download.pytorch.org/libtorch/cpu/libtorch-win-shared-with-deps-2.0.1%2Bcpu.zip -o libtorch.zip
+          unzip libtorch.zip
+      - name: Setup puredata
+        run: |
+          mkdir pd
+          cd pd
+          curl -L https://msp.puredata.info/Software/pd-0.53-2.msw.zip -o pd.zip
+          unzip pd.zip
+          mv pd*/src .
+          mv pd*/bin .
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          cmake ../src -DCMAKE_PREFIX_PATH=${{ github.workspace }}/libtorch -DPUREDATA_INCLUDE_DIR=${{ github.workspace }}/pd/src -DPUREDATA_BIN_DIR=${{ github.workspace }}/pd/bin -A x64
+          cmake --build . --config Release
+      - name: Max/MSP Package creation
         run: |
           mkdir nn_tilde
           mkdir nn_tilde/help
           mv src/externals nn_tilde
           cp src/frontend/maxmsp/nn_tilde/nn~.maxhelp nn_tilde/help
-          tar -czvf nn_max_msp_macOS_x86_64.tar.gz nn_tilde
+          tar -czvf nn_max_msp_windows_x64.tar.gz nn_tilde
+      - name: PureData Package creation
+        run: |
+          Remove-Item -Force -Recurse nn_tilde
+          mkdir nn_tilde
+          mv build/frontend/puredata/nn_tilde/Release/* nn_tilde/
+          tar -czvf nn_puredata_windows_x64.tar.gz nn_tilde
       - name: Upload binaries
         uses: actions/upload-artifact@v2
         with:
           name: nn_tilde
-          path: nn_max_msp_macOS_x86_64.tar.gz
+          path: |
+            nn_max_msp_windows_x64.tar.gz
+            nn_puredata_windows_x64.tar.gz
 
   AutomaticRelease:
     runs-on: ubuntu-latest
-    needs: [arm64-build, x86_64-build]
+    needs: [osx-arm64-build, osx-x64-build, windows-x64-build]
     steps:
       - name: Download build binaries
         uses: actions/download-artifact@v2
@@ -76,5 +144,9 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
           files: |
-            nn_max_msp_macOS_x86_64.tar.gz
+            nn_max_msp_macOS_x64.tar.gz
+            nn_puredata_macOS_x64.tar.gz
             nn_max_msp_macOS_arm64.tar.gz
+            nn_puredata_macOS_arm64.tar.gz
+            nn_max_msp_windows_x64.tar.gz
+            nn_puredata_windows_x64.tar.gz
diff --git a/.github/workflows/python-publish.yaml b/.github/workflows/python-publish.yaml
@@ -0,0 +1,32 @@
+name: Upload Python Package
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.10'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel build
+        python -m pip install -r requirements.txt
+    - name: Build package
+      run: NN_TILDE_VERSION=${{  github.ref_name }} python -m build
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,6 @@ src/tests
 *libtorch
 *DS_Store*
 src/docs
-*.ts
+*.ts
+dist/
+*.egg-info*
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include requirements.txt