Compare commits
17 Commits
6fbaead435
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| ae50c9ce19 | |||
| dc7e2ad9d1 | |||
| e89601d835 | |||
| e17bef0f89 | |||
| 4f795aad96 | |||
| 2802f757d1 | |||
| 55bd48090e | |||
| 655cfbb517 | |||
| 40c35e8aee | |||
| 824132967b | |||
| 682bbd04f2 | |||
| 06fa286d50 | |||
| a2cc9c1391 | |||
| d57f53613e | |||
| a62771d2f2 | |||
| c8bb32773e | |||
| 6917780253 |
+5
-5
@@ -5,8 +5,8 @@ data/*
|
||||
.cache/
|
||||
|
||||
# COLMAP binaries
|
||||
colmap/bin
|
||||
colmap/plugins
|
||||
colmap/COLMAP.bat
|
||||
colmap/RUN_TESTS.bat
|
||||
/lichtfeld-studio/LichtFeld-Studio-*
|
||||
colmap/COLMAP/
|
||||
|
||||
# LichtFeld Studio binaries
|
||||
/lichtfeld-studio/LichtFeld-Studio-Portable/
|
||||
.ipynb_checkpoints
|
||||
|
||||
@@ -18,3 +18,7 @@
|
||||
path = mq3drecon/metaquest-3d-reconstruction
|
||||
url = https://github.com/t-34400/metaquest-3d-reconstruction
|
||||
branch = main
|
||||
[submodule "ml-sharp"]
|
||||
path = ml-sharp/ml-sharp
|
||||
url = https://github.com/apple/ml-sharp.git
|
||||
branch = main
|
||||
|
||||
@@ -36,10 +36,29 @@ RUN apt-get update && \
|
||||
libqt6opengl6-dev \
|
||||
libqt6openglwidgets6 \
|
||||
libcgal-dev \
|
||||
libceres-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libssl-dev \
|
||||
libmkl-full-dev
|
||||
libmkl-full-dev \
|
||||
libsuitesparse-dev \
|
||||
libcudss0-dev-cuda-12 \
|
||||
libcudss0-static-cuda-12
|
||||
|
||||
# Install Ceres Solver with CUDA support. Disable testing and examples since
|
||||
# the GPU isn't available to us at build time
|
||||
RUN git clone --recursive https://github.com/ceres-solver/ceres-solver
|
||||
RUN mkdir ceres-bin && \
|
||||
cd ceres-bin && \
|
||||
cmake ../ceres-solver \
|
||||
-DUSE_CUDA=ON \
|
||||
-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES} \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DBUILD_EXAMPLES=OFF \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-Dcudss_DIR=/usr/lib/x86_64-linux-gnu/libcudss/12/cmake/cudss \
|
||||
-Dcudss_INCLUDE_DIR=/usr/include/libcudss/12 && \
|
||||
make -j8 && \
|
||||
make test && \
|
||||
make install
|
||||
|
||||
# Fix issue in Ubuntu's openimageio CMake config.
|
||||
# We don't depend on any of openimageio's OpenCV functionality,
|
||||
@@ -47,7 +66,7 @@ RUN apt-get update && \
|
||||
RUN mkdir -p /usr/include/opencv4
|
||||
|
||||
# Build and install COLMAP.
|
||||
RUN git clone https://github.com/colmap/colmap.git
|
||||
RUN git clone --recursive https://github.com/colmap/colmap.git
|
||||
RUN cd colmap && \
|
||||
git fetch https://github.com/colmap/colmap.git ${COLMAP_GIT_COMMIT} && \
|
||||
git checkout FETCH_HEAD && \
|
||||
@@ -57,7 +76,9 @@ RUN cd colmap && \
|
||||
-GNinja \
|
||||
-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES} \
|
||||
-DCMAKE_INSTALL_PREFIX=/colmap-install \
|
||||
-DBLA_VENDOR=Intel10_64lp && \
|
||||
-DBLA_VENDOR=Intel10_64lp \
|
||||
-Dcudss_DIR=/usr/lib/x86_64-linux-gnu/libcudss/12/cmake/cudss \
|
||||
-Dcudss_INCLUDE_DIR=/usr/include/libcudss/12 && \
|
||||
ninja install
|
||||
|
||||
#
|
||||
@@ -71,11 +92,12 @@ FROM nvidia/cuda:${NVIDIA_CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION} AS runti
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
libboost-program-options1.83.0 \
|
||||
libspqr4 \
|
||||
libcholmod5 \
|
||||
libc6 \
|
||||
libomp5 \
|
||||
libopengl0 \
|
||||
libmetis5 \
|
||||
libceres4t64 \
|
||||
libopenimageio2.4t64 \
|
||||
libgcc-s1 \
|
||||
libgl1 \
|
||||
@@ -90,7 +112,8 @@ RUN apt-get update && \
|
||||
libmkl-locale \
|
||||
libmkl-intel-lp64 \
|
||||
libmkl-intel-thread \
|
||||
libmkl-core && \
|
||||
libmkl-core \
|
||||
libcudss0-cuda-12 && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
@@ -101,3 +124,9 @@ RUN apt-get update && \
|
||||
# a library. For instance, CMake will be able to find COLMAP easily with the
|
||||
# command: find_package(COLMAP REQUIRED).
|
||||
COPY --from=builder /colmap-install/ /usr/local/
|
||||
COPY --from=builder /usr/local/include/ /usr/local/include/
|
||||
COPY --from=builder /usr/local/lib/ /usr/local/lib/
|
||||
COPY --from=builder /usr/lib/x86_64-linux-gnu/libcudss /usr/lib/x86_64-linux-gnu/libcudss
|
||||
|
||||
ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/libcudss/12:$LD_LIBRARY_PATH
|
||||
WORKDIR /workspace
|
||||
@@ -7,3 +7,7 @@ services:
|
||||
extends:
|
||||
file: ../config.yml
|
||||
service: win-gui-app
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./.cache/colmap
|
||||
target: /root/.cache
|
||||
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
+3
-2
@@ -1,3 +1,4 @@
|
||||
curl -LO https://github.com/colmap/colmap/releases/latest/download/colmap-x64-windows-cuda.zip
|
||||
tar -xf colmap-x64-windows-cuda.zip
|
||||
curl -L -o colmap-x64-windows-cuda.zip "https://github.com/colmap/colmap/releases/latest/download/colmap-x64-windows-cuda.zip"
|
||||
mkdir COLMAP
|
||||
tar -xf colmap-x64-windows-cuda.zip -C COLMAP
|
||||
del colmap-x64-windows-cuda.zip
|
||||
Submodule lichtfeld-studio/LichtFeld-Studio updated: 48a4a85573...584f154bfd
Binary file not shown.
@@ -0,0 +1,49 @@
|
||||
1. Go to AppData directory
|
||||
|
||||
```
|
||||
cd %APPDATA%
|
||||
```
|
||||
|
||||
2. Clone and set up vcpkg
|
||||
|
||||
```
|
||||
git clone https://github.com/microsoft/vcpkg.git
|
||||
cd vcpkg && .\bootstrap-vcpkg.bat -disableMetrics && cd ..
|
||||
```
|
||||
|
||||
3. Run the following in the LichtFeld-Studio directory
|
||||
NOTE: This creates a portable build for devices with CUDA Compute Capability 8.6
|
||||
|
||||
```
|
||||
cmake -B build -S . -G Ninja ^
|
||||
-DCMAKE_BUILD_TYPE=Release ^
|
||||
-DBUILD_PORTABLE=ON ^
|
||||
-DBUILD_PYTHON_STUBS=OFF ^
|
||||
-DCMAKE_CUDA_ARCHITECTURES=86 ^
|
||||
-DBUILD_CUDA_MIN_SM=86 ^
|
||||
-DCMAKE_TOOLCHAIN_FILE="%APPDATA%\vcpkg\scripts\buildsystems\vcpkg.cmake"
|
||||
```
|
||||
|
||||
4. Run the following. Adjust the number of threads accordingly
|
||||
|
||||
```
|
||||
cmake --build build -j4
|
||||
```
|
||||
|
||||
5. Run the following to create the portable build.
|
||||
|
||||
```
|
||||
cmake --install build --prefix ../LichtFeld-Studio-Portable
|
||||
```
|
||||
|
||||
| NOTE: The full directory structure of the portable install should look like so:
|
||||
|
||||
```
|
||||
.
|
||||
├── bin/
|
||||
├── DLLs/
|
||||
├── extensions/
|
||||
├── Lib/
|
||||
├── share/
|
||||
└── LICENSE (35 KB)
|
||||
```
|
||||
@@ -0,0 +1,18 @@
|
||||
FROM continuumio/miniconda3:latest
|
||||
|
||||
WORKDIR /workspace/ml-sharp
|
||||
COPY ml-sharp .
|
||||
|
||||
RUN conda create -n sharp python=3.13
|
||||
SHELL ["conda", "run", "-n", "sharp", "/bin/bash", "-c"]
|
||||
|
||||
RUN pip install -r requirements.txt
|
||||
RUN pip3 install --no-cache-dir \
|
||||
--index-url https://download.pytorch.org/whl/cu130 \
|
||||
#--extra-index-url https://mirrors.tencent.com/pytorch-wheels/whl/cu130/ \
|
||||
torch \
|
||||
torchvision
|
||||
|
||||
WORKDIR /workspace
|
||||
RUN echo "conda activate sharp" >> ~/.profile
|
||||
CMD ["/bin/bash", "-l"]
|
||||
@@ -0,0 +1,16 @@
|
||||
services:
|
||||
|
||||
ml-sharp:
|
||||
build:
|
||||
context: .
|
||||
image: ml-sharp:personal
|
||||
extends:
|
||||
file: ../config.yml
|
||||
service: base-app
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./ml-sharp
|
||||
target: /workspace/ml-sharp
|
||||
- type: bind
|
||||
source: ./.cache
|
||||
target: /root/.cache
|
||||
Submodule
+1
Submodule ml-sharp/ml-sharp added at 1eaa046834
@@ -0,0 +1 @@
|
||||
docker compose run --rm -it --name ml-sharp ml-sharp
|
||||
@@ -3,7 +3,7 @@ services:
|
||||
mq3drecon:
|
||||
build:
|
||||
context: .
|
||||
image: mq3drecon:dev
|
||||
image: mq3drecon:personal
|
||||
extends:
|
||||
file: ../config.yml
|
||||
service: win-gui-app
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
FROM pytorch/pytorch:2.6.0-cuda12.6-cudnn9-runtime
|
||||
FROM pytorch/pytorch:2.12.0-cuda13.2-cudnn9-runtime
|
||||
|
||||
RUN pip install \
|
||||
RUN pip install --break-system-packages --no-cache-dir \
|
||||
"opencv-python>=4.5,<4.12" \
|
||||
"numpy>=1.21,<2.3"
|
||||
"numpy>=1.21,<2.3" \
|
||||
"gradio" \
|
||||
"notebook" \
|
||||
"matplotlib"
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
ffmpeg \
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
jupyter notebook --allow-root --ip 0.0.0.0 --no-browser --NotebookApp.token='' --NotebookApp.password=''
|
||||
@@ -3,7 +3,7 @@ services:
|
||||
muggled_sam:
|
||||
build:
|
||||
context: .
|
||||
image: muggled_sam:dev
|
||||
image: muggled_sam:personal
|
||||
extends:
|
||||
file: ../config.yml
|
||||
service: win-gui-app
|
||||
@@ -11,6 +11,9 @@ services:
|
||||
- type: bind
|
||||
source: ./muggled_sam
|
||||
target: /workspace/muggled-sam
|
||||
- type: bind
|
||||
source: ./notebooks
|
||||
target: /workspace/muggled-sam/notebooks
|
||||
- type: bind
|
||||
source: ../data/muggled-sam/saved_images
|
||||
target: /workspace/muggled-sam/saved_images
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
curl -o "muggled_sam\model_weights\sam2.1_hiera_large.pt" https://dl.fbaipublicfiles.com/segment_anything_2/092824/sam2.1_hiera_large.pt
|
||||
+1
-1
Submodule muggled-sam/muggled_sam updated: 02bc10e6f9...ab3c930712
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
docker compose run --rm -it --name muggled_sam muggled_sam
|
||||
docker compose run -p 8888:8888 -p 7860:7860 --rm -it --name muggled_sam muggled_sam
|
||||
@@ -0,0 +1 @@
|
||||
docker compose run -p 8888:8888 -p 7860:7860 --rm -it --entrypoint "jupyter notebook --allow-root --ip 0.0.0.0 --no-browser --NotebookApp.token='' --NotebookApp.password=''" --name muggled_sam muggled_sam
|
||||
@@ -0,0 +1,8 @@
|
||||
FROM node:current-alpine3.23
|
||||
|
||||
RUN npm install -g @playcanvas/splat-transform
|
||||
RUN apk add gcompat
|
||||
|
||||
WORKDIR /workspace
|
||||
|
||||
CMD ["/bin/sh", "-l"]
|
||||
@@ -0,0 +1,10 @@
|
||||
services:
|
||||
|
||||
splat_transform:
|
||||
build:
|
||||
context: .
|
||||
image: splat_transform:personal
|
||||
extends:
|
||||
file: ../config.yml
|
||||
service: base-app
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
docker compose run --rm -it --name splat_transform --entrypoint /bin/sh splat_transform
|
||||
Reference in New Issue
Block a user