-
-
Notifications
You must be signed in to change notification settings - Fork 336
Fix issue #201 : add PDAL reader #2014
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Husamm
wants to merge
29
commits into
f3d-app:master
Choose a base branch
from
Husamm:pdal-vtk-reader-201
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 16 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
f1e02cb
copy vdb dir as it
Husamm 6bc28c1
rename the files
Husamm 5e0f7ec
initial enablement
Husamm 73ce036
Fixed review comments
Husamm 9fcd61c
add support for other models
Husamm 7048e05
remove ept and e57
Husamm 878d5ac
first patch of tests
Husamm d8330f1
more tests
Husamm 23d52c3
remove one test
Husamm a90c481
Add CI logic
Husamm 70ccd01
syntax fix to configs jsons
Husamm 1b67c16
fixes from CR
Husamm 71b1cac
copy zlib install dep to proj install dep
Husamm ac3b28f
build proj, as gdal depend on it
Husamm 77b1eb6
install sqllite
Husamm e3191a5
fix to install sqllite
Husamm d517c7d
Revert "fix to install sqllite"
Husamm 5b39c7c
Revert "install sqllite"
Husamm 3878a99
Revert "build proj, as gdal depend on it"
Husamm f626723
Revert "copy zlib install dep to proj install dep"
Husamm 1ab0ccd
disable proj in gdal build
Husamm ad06471
Revert "disable proj in gdal build"
Husamm ccfb48b
Reapply "copy zlib install dep to proj install dep"
Husamm 982d1a5
Reapply "build proj, as gdal depend on it"
Husamm caf5e62
copy zlib to sqlite
Husamm 41a7901
clone and install sqlite
Husamm 8a22ad8
try simplefied action
Husamm 2f783ac
Revert "try simplefied action"
Husamm 168ca03
update proj install
Husamm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
name: 'Install GDAL Dependency' | ||
description: 'Install GDAL Dependency using cache when possible' | ||
|
||
inputs: | ||
cpu: | ||
description: 'CPU architecture to build for' | ||
required: false | ||
default: 'x86_64' | ||
|
||
runs: | ||
using: "composite" | ||
steps: | ||
|
||
- name: Cache GDAL | ||
id: cache-gdal | ||
uses: actions/cache/restore@v4 | ||
with: | ||
path: dependencies/gdal_install | ||
key: gdal-v3.8.0-${{runner.os}}-${{inputs.cpu}}-0 | ||
|
||
# Dependents: pdal, proj | ||
- name: Install SQLite3 dependencies | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
shell: bash | ||
run: | | ||
if [[ "${{runner.os}}" == "Linux" ]]; then | ||
sudo apt-get update | ||
sudo apt-get install -y sqlite3 libsqlite3-dev | ||
elif [[ "${{runner.os}}" == "macOS" ]]; then | ||
brew install sqlite | ||
elif [[ "${{runner.os}}" == "Windows" ]]; then | ||
choco install sqlite | ||
fi | ||
|
||
- name: Install PROJ Dependency | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
uses: ./source/.github/actions/proj-install-dep | ||
with: | ||
cpu: ${{ inputs.cpu }} | ||
|
||
- name: Checkout GDAL | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
uses: actions/checkout@v4 | ||
with: | ||
repository: OSGeo/gdal | ||
path: './dependencies/gdal' | ||
ref: v3.8.0 | ||
|
||
- name: Setup GDAL | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies | ||
shell: bash | ||
run: | | ||
mkdir gdal_build | ||
mkdir gdal_install | ||
|
||
- name: Configure GDAL | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies/gdal_build | ||
shell: bash | ||
run: > | ||
cmake ../gdal | ||
-DBUILD_SHARED_LIBS=ON | ||
-DCMAKE_BUILD_TYPE=Release | ||
-DCMAKE_INSTALL_PREFIX=../gdal_install | ||
-DGDAL_USE_EXTERNAL_LIBS=ON | ||
-DGDAL_ENABLE_DRIVER_GPKG=ON | ||
-DGDAL_ENABLE_DRIVER_TIFF=ON | ||
-DGDAL_ENABLE_DRIVER_NETCDF=OFF | ||
-DGDAL_ENABLE_DRIVER_POSTGIS=OFF | ||
-DGDAL_ENABLE_DRIVER_SHP=ON | ||
-DGDAL_ENABLE_DRIVER_VRT=ON | ||
-DGDAL_ENABLE_DRIVER_PDF=OFF | ||
-DGDAL_ENABLE_DRIVER_OPENJPEG=OFF | ||
-DGDAL_ENABLE_DRIVER_JPEG=ON | ||
-DGDAL_ENABLE_DRIVER_PNG=ON | ||
-DGDAL_USE_ZLIB=ON | ||
-DGDAL_USE_LZMA=ON | ||
-DGDAL_USE_ZSTD=ON | ||
-DCMAKE_PREFIX_PATH:PATH=$(pwd)/../install/ | ||
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || '' }} | ||
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || '' }} | ||
|
||
- name: Build GDAL | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies/gdal_build | ||
shell: bash | ||
run: cmake --build . --parallel 2 --target install --config Release | ||
|
||
- name: Copy to install | ||
working-directory: ${{github.workspace}}/dependencies/gdal_install | ||
shell: bash | ||
run: cp -r ./* ../install/ | ||
|
||
- name: Save cache | ||
if: steps.cache-gdal.outputs.cache-hit != 'true' | ||
uses: actions/cache/save@v4 | ||
with: | ||
key: ${{ steps.cache-gdal.outputs.cache-primary-key }} | ||
path: dependencies/gdal_install |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
name: 'Install PDAL Dependency' | ||
description: 'Install PDAL Dependency using cache when possible' | ||
inputs: | ||
cpu: | ||
description: 'CPU architecture to build for' | ||
required: false | ||
default: 'x86_64' | ||
version: | ||
description: 'Version of PDAL to build' | ||
required: true | ||
|
||
runs: | ||
using: "composite" | ||
steps: | ||
|
||
- name: Check required inputs | ||
shell: bash | ||
run: | | ||
[[ "${{ inputs.version }}" ]] || { echo "version input is empty" ; exit 1; } | ||
|
||
- name: Cache PDAL | ||
id: cache-pdal | ||
uses: actions/cache/restore@v4 | ||
with: | ||
path: dependencies/pdal_install | ||
key: pdal-${{inputs.version}}-${{runner.os}}-${{inputs.cpu}}-0 | ||
|
||
# Dependents (not version): vtk | ||
- name: Checkout PDAL | ||
if: steps.cache-pdal.outputs.cache-hit != 'true' | ||
uses: actions/checkout@v4 | ||
with: | ||
repository: PDAL/PDAL | ||
path: './dependencies/pdal' | ||
ref: ${{inputs.version}} | ||
|
||
- name: Setup PDAL | ||
if: steps.cache-pdal.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies | ||
shell: bash | ||
run: | | ||
mkdir pdal_build | ||
mkdir pdal_install | ||
|
||
- name: Configure PDAL | ||
if: steps.cache-pdal.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies/pdal_build | ||
shell: bash | ||
run: > | ||
cmake ../pdal | ||
-DBUILD_SHARED_LIBS=ON | ||
-DCMAKE_BUILD_TYPE=Release | ||
-DCMAKE_CXX_STANDARD=17 | ||
-DCMAKE_CXX_STANDARD_REQUIRED=ON | ||
-DCMAKE_CXX_EXTENSIONS=OFF | ||
-DCMAKE_INSTALL_LIBDIR:PATH=lib | ||
-DCMAKE_INSTALL_PREFIX=../pdal_install | ||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON | ||
-DCMAKE_PREFIX_PATH:PATH=$(pwd)/../install/ | ||
-DWITH_TESTS=OFF | ||
-DWITH_COMPLETION=OFF | ||
-DWITH_LASZIP=ON | ||
-DWITH_ZSTD=ON | ||
-DWITH_LZMA=ON | ||
-DWITH_GDAL=ON | ||
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} | ||
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} | ||
|
||
- name: Build PDAL | ||
if: steps.cache-pdal.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies/pdal_build | ||
shell: bash | ||
run: cmake --build . --parallel 2 --target install --config Release | ||
|
||
- name: Copy to install | ||
working-directory: ${{github.workspace}}/dependencies/pdal_install | ||
shell: bash | ||
run: cp -r ./* ../install/ | ||
|
||
- name: Save cache | ||
if: steps.cache-pdal.outputs.cache-hit != 'true' | ||
uses: actions/cache/save@v4 | ||
with: | ||
key: ${{ steps.cache-pdal.outputs.cache-primary-key }} | ||
path: dependencies/pdal_install |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
name: 'Install PROJ Dependency' | ||
description: 'Install PROJ Dependency using cache when possible' | ||
inputs: | ||
cpu: | ||
description: 'CPU architecture to build for' | ||
required: false | ||
default: 'x86_64' | ||
|
||
runs: | ||
using: "composite" | ||
steps: | ||
|
||
- name: Cache PROJ | ||
id: cache-proj | ||
uses: actions/cache/restore@v4 | ||
with: | ||
path: dependencies/proj_install | ||
key: proj-9.4.0-${{runner.os}}-${{inputs.cpu}}-1 | ||
|
||
- name: Install SQLite3 dependencies | ||
if: steps.cache-proj.outputs.cache-hit != 'true' | ||
shell: bash | ||
run: | | ||
if [[ "${{runner.os}}" == "Linux" ]]; then | ||
sudo apt-get update | ||
sudo apt-get install -y sqlite3 libsqlite3-dev | ||
elif [[ "${{runner.os}}" == "macOS" ]]; then | ||
brew install sqlite | ||
elif [[ "${{runner.os}}" == "Windows" ]]; then | ||
choco install sqlite | ||
fi | ||
|
||
# Dependents: gdal | ||
- name: Checkout PROJ | ||
if: steps.cache-proj.outputs.cache-hit != 'true' | ||
uses: actions/checkout@v4 | ||
with: | ||
repository: OSGeo/PROJ | ||
path: './dependencies/proj' | ||
ref: 9.4.0 | ||
|
||
- name: Setup PROJ | ||
if: steps.cache-proj.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies | ||
shell: bash | ||
run: | | ||
mkdir proj_build | ||
mkdir proj_install | ||
|
||
- name: Configure PROJ | ||
if: steps.cache-proj.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies/proj_build | ||
shell: bash | ||
run: > | ||
cmake ../proj | ||
-DBUILD_SHARED_LIBS=ON | ||
-DCMAKE_BUILD_TYPE=Release | ||
-DCMAKE_INSTALL_PREFIX=../proj_install | ||
-DCMAKE_PREFIX_PATH=$(pwd)/../install | ||
-DBUILD_TESTING=OFF | ||
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || '' }} | ||
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || '' }} | ||
|
||
- name: Build PROJ | ||
if: steps.cache-proj.outputs.cache-hit != 'true' | ||
working-directory: ${{github.workspace}}/dependencies/proj_build | ||
shell: bash | ||
run: cmake --build . --parallel 2 --target install --config Release | ||
|
||
- name: Copy to install | ||
working-directory: ${{github.workspace}}/dependencies/proj_install | ||
shell: bash | ||
run: cp -r ./* ../install/ | ||
|
||
- name: Save cache | ||
if: steps.cache-proj.outputs.cache-hit != 'true' | ||
uses: actions/cache/save@v4 | ||
with: | ||
key: ${{ steps.cache-proj.outputs.cache-primary-key }} | ||
path: dependencies/proj_install |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.