Skip to content
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.

Sign up for GitHub

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

Add rust and odc-algo version with geomedian #5

Closed
wants to merge 12 commits into from
Closed

Add rust and odc-algo version with geomedian #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b88b8d2
Add rust and odc-algo version with geomedian
alexgleith Jun 12, 2024
52d0786
Add build-essential
alexgleith Jun 12, 2024
145bf5d
Add GCC to conda, not the base OS
alexgleith Jun 12, 2024
fdadf3f
Try another way
alexgleith Jun 12, 2024
652f89a
Try installing as root
alexgleith Jun 12, 2024
9bbf878
Add curl
alexgleith Jun 12, 2024
4adf173
Try adding libgcc-ng
alexgleith Jun 12, 2024
05ef9e0
Try again
alexgleith Jun 12, 2024
83e5430
Add rustflags
alexgleith Jun 12, 2024
d4e8f06
Export env var earlier
alexgleith Jun 12, 2024
9cebbce
Update python/Dockerfile
alexgleith Jun 12, 2024
5546d67
Simplify
alexgleith Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ RUN wget https://code-server.dev/install.sh -O /tmp/install.sh && \
sh /tmp/install.sh --version 4.19.1 && \
rm /tmp/install.sh

RUN export RUSTFLAGS="-C link-arg=-Wl,-rpath-link,${CONDA_PREFIX}/lib -C link-arg=-Wl,-rpath,${CONDA_PREFIX}/lib -L${CONDA_PREFIX}/lib" && \
python -m pip install git+https://github.com/opendatacube/odc-algo.git@add-rust-geomedian-impl

Comment on lines +9 to +11
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove these lines after adding rust_linux-64 to environment.yml, and moving the pip install command to requirements.txt.

Suggested change
RUN export RUSTFLAGS="-C link-arg=-Wl,-rpath-link,${CONDA_PREFIX}/lib -C link-arg=-Wl,-rpath,${CONDA_PREFIX}/lib -L${CONDA_PREFIX}/lib" && \
python -m pip install git+https://github.com/opendatacube/odc-algo.git@add-rust-geomedian-impl

USER $NB_USER

RUN code-server --install-extension ms-python.python && \
Expand Down
3 changes: 3 additions & 0 deletions python/apt.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
curl
fish
git
htop
jq
rustc
cargo
Comment on lines +6 to +7
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't need to apt install rustc or cargo packages since they will be installed by conda.

Suggested change
rustc
cargo

Loading
Loading