Merge pull request #61 from Asher-1/develop

Develop
Asher-1 · Oct 7, 2024 · 531309e · 531309e
2 parents ed0882b + 1538af9
commit 531309e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/ubuntu-cuda.yml b/.github/workflows/ubuntu-cuda.yml
@@ -10,7 +10,7 @@ on:
         default: 'ON'
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, reopened, synchronize]
 
@@ -89,19 +89,19 @@ jobs:
           if-no-files-found: error
 
       - name: Update devel release
-        if: ${{ github.ref == 'refs/heads/master' && env.BUILD_PACKAGE == 'true' }}
+        if: ${{ github.ref == 'refs/heads/main' && env.BUILD_PACKAGE == 'true' }}
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release upload master-devel cloudViewer-devel-linux-*.tar.xz --clobber
-          gh release view master-devel
+          gh release upload main-devel cloudViewer-devel-linux-*.tar.xz --clobber
+          gh release view main-devel
 
       - name: run docker
         run: |
           cd "${GITHUB_WORKSPACE}/.."
           ACloudViewer/docker/docker_test.sh ${CI_CONFIG}
 
       # - name: ccache upload
-      #   if: ${{ github.ref == 'refs/heads/master' }}
+      #   if: ${{ github.ref == 'refs/heads/main' }}
       #   run: |
       #     cp ${CCACHE_TAR_NAME}.tar.gz "$PWD"
diff --git a/.github/workflows/ubuntu-wheel.yml b/.github/workflows/ubuntu-wheel.yml
@@ -10,7 +10,7 @@ on:
         default: 'ON'
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, reopened, synchronize]
 
@@ -35,7 +35,7 @@ jobs:
       matrix:
         python_version: ['3.8', '3.9', '3.10', '3.11']
         is_main:
-          - ${{ github.ref == 'refs/heads/master' }}
+          - ${{ github.ref == 'refs/heads/main' }}
         exclude:
           - is_main: false
             python_version: '3.8'
@@ -89,13 +89,13 @@ jobs:
             ${{ env.PIP_CPU_PKG_NAME }}
           if-no-files-found: error
       - name: Update devel release
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release upload master-devel ${GITHUB_WORKSPACE}/${{ env.PIP_PKG_NAME }} \
+          gh release upload main-devel ${GITHUB_WORKSPACE}/${{ env.PIP_PKG_NAME }} \
           ${GITHUB_WORKSPACE}/${{ env.PIP_CPU_PKG_NAME }} --clobber
-          gh release view master-devel
+          gh release view main-devel
 
   test-wheel-cpu:
     name: Test wheel CPU
@@ -108,7 +108,7 @@ jobs:
       matrix:
         python_version: ['3.8', '3.9', '3.10', '3.11']
         is_main:
-          - ${{ github.ref == 'refs/heads/master' }}
+          - ${{ github.ref == 'refs/heads/main' }}
         exclude:
           - is_main: false
             python_version: '3.8'

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -10,7 +10,7 @@ on:
         default: 'ON'
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, reopened, synchronize]
 
@@ -66,9 +66,9 @@ jobs:
           path: cloudViewer*.zip
           if-no-files-found: error
       - name: Update devel release
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release upload master-devel cloudViewer*.zip --clobber
-          gh release view master-devel
+          gh release upload main-devel cloudViewer*.zip --clobber
+          gh release view main-devel
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -38,8 +38,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        BUILD_SHARED_LIBS: [ON, OFF]
-        STATIC_RUNTIME: [ON, OFF]
+        BUILD_SHARED_LIBS: [OFF]
+        STATIC_RUNTIME: [OFF]
         BUILD_CUDA_MODULE: [ON, OFF]
         CONFIG: [Release, Debug]
         exclude:

diff --git a/README.md b/README.md
@@ -25,9 +25,10 @@
 
 Introduction
 ------------
-ACloudViewer is an open-source library that supports rapid development of software that deals with 3D data. The
-ACloudViewer frontend exposes a set of carefully selected data structures and algorithms in both C++ and Python. The
-backend is highly optimized and is set up for parallelization. We welcome contributions from the open-source community.
+ACloudViewer is an open-source library that supports rapid development of software that deals with 3D data 
+which is highly based on CloudCompare, Open3D and colmap with PCL. The ACloudViewer frontend exposes a set of 
+carefully selected data structures and algorithms in both C++ and Python. The backend is highly optimized and 
+is set up for parallelization. We welcome contributions from the open-source community.
 
 ------------
 ACloudViewer is a 3D point cloud (and triangular mesh) processing software. It was originally designed to perform

diff --git a/docker/build-ubuntu.sh b/docker/build-ubuntu.sh
@@ -85,6 +85,7 @@ if [[ "$(docker images -q cloudviewer:${CLOUDVIEWER_VERSION}-ubuntu${UBUNTU_VERS
 	echo "Build cloudviewer:${CLOUDVIEWER_VERSION}-ubuntu${UBUNTU_VERSION}-cuda${CUDA_VERSION} Done."
 	echo "Building ouput package dir is: $host_install_package_dir"
 fi
-# echo "Start to Delete docker image: cloudviewer:${CLOUDVIEWER_VERSION}-ubuntu${UBUNTU_VERSION}-cuda${CUDA_VERSION}."
-# docker rmi cloudviewer:${CLOUDVIEWER_VERSION}-ubuntu${UBUNTU_VERSION}-cuda${CUDA_VERSION}
-# echo "Delete done."
+
+echo "Start to Delete docker image: cloudviewer:${CLOUDVIEWER_VERSION}-ubuntu${UBUNTU_VERSION}-cuda${CUDA_VERSION}."
+docker rmi cloudviewer:${CLOUDVIEWER_VERSION}-ubuntu${UBUNTU_VERSION}-cuda${CUDA_VERSION}
+echo "Delete done."