Remove soversion (#18)

csukuangfj · Jul 10, 2024 · b88e7c2 · b88e7c2
1 parent 6a6d109
commit b88e7c2
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 10 deletions.
diff --git a/.github/workflows/aarch64-shared.yaml b/.github/workflows/aarch64-shared.yaml
@@ -24,7 +24,8 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [aarch64]
-        config: ['Debug', 'MinSizeRel', 'Release', 'RelWithDebInfo']
+        # config: ['Debug', 'MinSizeRel', 'Release', 'RelWithDebInfo']
+        config: ['MinSizeRel', 'Release']
         # config: ['Release']
 
     steps:
@@ -49,6 +50,17 @@ jobs:
           submodules: true
           ref: v${{ env.ONNXRUNTIME_VERSION }}
 
+      - name: patch
+        if: steps.cache-build-result.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          sed -i.bak '/SOVERSION/d' ./cmake/onnxruntime.cmake
+          sed -i.bak '/onnxruntime PROPERTIES VERSION/d' ./cmake/onnxruntime.cmake
+
+          git diff
+
+          sudo apt-get install -y patchelf
+
       - name: Build onnxruntime ${{ env.ONNXRUNTIME_VERSION }}
         if: steps.cache-build-result.outputs.cache-hit != 'true'
         uses: addnab/docker-run-action@v3
@@ -90,9 +102,6 @@ jobs:
               # cat ./VERSION_NUMBER
               # echo "---"
 
-              sed -i.bak '/SOVERSION/d' ./cmake/onnxruntime.cmake
-              git diff
-
               which python
 
               build_dir=/shared/build-shared
@@ -143,6 +152,14 @@ jobs:
           mv $build_dir/$artifact ./
           tree ./$artifact
 
+          # ldd ./$artifact/lib/libonnxruntime.so
+          readelf -d ./$artifact/lib/libonnxruntime.so
+
+          patchelf --set-soname libonnxruntime.so ./$artifact/lib/libonnxruntime.so
+
+          # ldd ./$artifact/lib/libonnxruntime.so
+          readelf -d ./$artifact/lib/libonnxruntime.so
+
           zip -r ${artifact}.zip ./$artifact
 
       - name: Upload artifact
@@ -186,7 +203,7 @@ jobs:
             GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/onnxruntime-libs huggingface
 
             cd huggingface
-            git lfs pull
+            # git lfs pull
             cp -v ../onnxruntime-linux*.zip ./
             git status
             git lfs track "*.zip"

diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml
@@ -43,6 +43,7 @@ jobs:
           submodules: true
           ref: v${{ env.ONNXRUNTIME_VERSION }}
 
+
       - name: cache-toolchain
         id: cache-toolchain
         uses: actions/cache@v3
@@ -131,9 +132,12 @@ jobs:
           which python
 
           sed -i.bak '/SOVERSION/d' ./cmake/onnxruntime.cmake
+          sed -i.bak '/onnxruntime PROPERTIES VERSION/d' ./cmake/onnxruntime.cmake
 
           git diff
 
+          sudo apt-get install -y patchelf
+
       - name: Build onnxruntime for 32-bit ARM
         if: steps.cache-build-result.outputs.cache-hit != 'true'
         shell: bash
@@ -184,6 +188,16 @@ jobs:
 
           tree ./onnxruntime-linux-arm-$version/
 
+          artifact=onnxruntime-linux-arm-$version
+
+          # ldd ./$artifact/lib/libonnxruntime.so
+          readelf -d ./$artifact/lib/libonnxruntime.so
+
+          patchelf --set-soname libonnxruntime.so ./$artifact/lib/libonnxruntime.so
+
+          # ldd ./$artifact/lib/libonnxruntime.so
+          readelf -d ./$artifact/lib/libonnxruntime.so
+
           cp -v ./include/onnxruntime/core/session/onnxruntime_float16.h ./onnxruntime-linux-arm-$version/include
 
           zip -r onnxruntime-linux-arm-${version}.zip ./onnxruntime-linux-arm-$version/
@@ -216,7 +230,7 @@ jobs:
           GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/onnxruntime-libs huggingface
 
           cd huggingface
-          git lfs pull
+          # git lfs pull
           cp -v ../onnxruntime-linux-arm-*.zip ./
           git status
           git lfs track "*.zip"

diff --git a/.github/workflows/linux-shared.yaml b/.github/workflows/linux-shared.yaml
@@ -24,7 +24,8 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64]
-        config: ['Debug', 'MinSizeRel', 'Release', 'RelWithDebInfo']
+        # config: ['Debug', 'MinSizeRel', 'Release', 'RelWithDebInfo']
+        config: ['MinSizeRel', 'Release']
 
 
     steps:
@@ -43,6 +44,17 @@ jobs:
           submodules: true
           ref: v${{ env.ONNXRUNTIME_VERSION }}
 
+      - name: patch
+        if: steps.cache-build-result.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          sed -i.bak '/SOVERSION/d' ./cmake/onnxruntime.cmake
+          sed -i.bak '/onnxruntime PROPERTIES VERSION/d' ./cmake/onnxruntime.cmake
+
+          git diff
+
+          sudo apt-get install -y patchelf
+
       - name: Build onnxruntime ${{ env.ONNXRUNTIME_VERSION }}
         if: steps.cache-build-result.outputs.cache-hit != 'true'
         uses: addnab/docker-run-action@v3
@@ -75,9 +87,7 @@ jobs:
               version=${{ env.ONNXRUNTIME_VERSION }}
               which python
 
-              sed -i.bak '/SOVERSION/d' ./cmake/onnxruntime.cmake
 
-              git diff
 
               build_dir=/shared/build-shared
 
@@ -127,6 +137,14 @@ jobs:
           mv $build_dir/$artifact ./
           tree ./$artifact
 
+          ldd ./$artifact/lib/libonnxruntime.so
+          readelf -d ./$artifact/lib/libonnxruntime.so
+
+          patchelf --set-soname libonnxruntime.so ./$artifact/lib/libonnxruntime.so
+
+          ldd ./$artifact/lib/libonnxruntime.so
+          readelf -d ./$artifact/lib/libonnxruntime.so
+
           zip -r ${artifact}.zip ./$artifact
 
       - name: Upload artifact
@@ -172,7 +190,7 @@ jobs:
             GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/onnxruntime-libs huggingface
 
             cd huggingface
-            git lfs pull
+            # git lfs pull
             cp -v ../onnxruntime-linux*.zip ./
             git status
             git lfs track "*.zip"