Skip to content

Commit

Permalink
Prepare mage for 1.14 release (#440)
Browse files Browse the repository at this point in the history
* Update memgraph version

* Pull memgraph 2.14

* remove node classification

* remove node classification test

* fix test failing

* update torch and dgl version

* use different pytorch version - cpu only

* remove link prediction

* remove test testing

* final update dockerfile release

* add rm keyword on text.so module

* remove double remove of file

---------

Co-authored-by: antoniofilipovic <[email protected]>
  • Loading branch information
MarkoBarisic and antoniofilipovic authored Jan 23, 2024
1 parent 2e47a68 commit a07db33
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
env:
DOCKER_ORGANIZATION_NAME: memgraph
DOCKER_REPOSITORY_NAME: memgraph-mage
MEMGRAPH_VERSION: 2.13.0
MEMGRAPH_VERSION: 2.14.0
steps:
- name: Checkout repository and submodules
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: True
env:
MEMGRAPH_VERSION: 2.13.0
MEMGRAPH_VERSION: 2.14.0
strategy:
matrix:
architecture: ["amd64", "arm64"]
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
PYTHONPATH: "$PWD/e2e"
run: |
cd e2e
docker exec -i -u root ${{ env.MAGE_CONTAINER }} bash -c "cd /mage/e2e/ && python3 -m pytest . -k 'not cugraph'"
docker exec -i -u root ${{ env.MAGE_CONTAINER }} bash -c "cd /mage/e2e/ && python3 -m pytest . -k 'not cugraph and not node_classification and not link_prediction and not text'"
- name: Run End-to-end correctness tests
if: matrix.architecture != 'arm64'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_no_ml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: True
env:
MEMGRAPH_VERSION: 2.13.0
MEMGRAPH_VERSION: 2.14.0
strategy:
matrix:
architecture: ["amd64", "arm64"]
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "cpp/memgraph"]
path = cpp/memgraph
url = https://github.com/memgraph/memgraph.git
branch = release/2.13
branch = release/2.14
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM debian:bullseye as base

USER root

ARG MG_VERSION=2.13.0
ARG MG_VERSION=2.14.0
ARG PY_VERSION_DEFAULT
ENV MG_VERSION ${MG_VERSION}
ENV PY_VERSION ${PY_VERSION_DEFAULT}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cugraph
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG CUGRAPH_VERSION=22.02
ARG CUDA_VERSION=11.5
ARG CUDA_VERSION_MINOR=11.5.2
ARG PY_VERSION=3.8
ARG MG_VERSION=2.13.0
ARG MG_VERSION=2.14.0

FROM rapidsai/rapidsai:${CUGRAPH_VERSION}-cuda${CUDA_VERSION}-runtime-ubuntu20.04-py${PY_VERSION} as cugraph-dev

Expand Down
9 changes: 7 additions & 2 deletions Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ COPY memgraph-${TARGETARCH}.deb .
# Hack to remove modules that cause error on loading of torch modules
# Must be here due to multi-phase build. The setup script is in dev phase
# whereas we unpack memgraph in the base phase
RUN dpkg -i memgraph-${TARGETARCH}.deb && rm memgraph-${TARGETARCH}.deb && rm /usr/lib/memgraph/query_modules/schema.so \
&& rm /usr/lib/memgraph/query_modules/example_cpp.so
RUN dpkg -i memgraph-${TARGETARCH}.deb && rm memgraph-${TARGETARCH}.deb

ENV LD_LIBRARY_PATH /usr/lib/memgraph/query_modules

Expand All @@ -61,6 +60,11 @@ RUN git clone --recurse-submodules -b 0.9.x https://github.com/dmlc/dgl.git \
&& cd dgl && mkdir build && cd build && cmake .. \
&& make -j4 && cd ../python && python3 setup.py install

# Needs to be here and in prod phase
# Remove modules with issues
RUN rm /usr/lib/memgraph/query_modules/node_classification.py \
&& rm /usr/lib/memgraph/query_modules/link_prediction.py \
&& rm /usr/lib/memgraph/query_modules/text.so

USER memgraph
ENTRYPOINT ["/usr/lib/memgraph/memgraph"]
Expand Down Expand Up @@ -91,6 +95,7 @@ RUN mv /mage/e2e /e2e/ \
&& export PATH="/usr/local/lib/python${PY_VERSION}:${PATH}" \
&& apt-get -y --purge autoremove clang git curl python3-pip python3-dev cmake build-essential \
&& apt-get clean


USER memgraph
ENTRYPOINT ["/usr/lib/memgraph/memgraph"]
Expand Down
2 changes: 1 addition & 1 deletion cpp/memgraph
Submodule memgraph updated 155 files
26 changes: 13 additions & 13 deletions e2e/igraphalg_test/test_all_shortest_path_length_no_path/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ query: >
output:
- dest_node_id: 1
length: '6.000000'
length: '6'
src_node_id: 0
- dest_node_id: 3
length: '11.000000'
length: '11'
src_node_id: 0
- dest_node_id: 4
length: inf
Expand All @@ -18,16 +18,16 @@ output:
length: inf
src_node_id: 0
- dest_node_id: 0
length: '0.000000'
length: '0'
src_node_id: 0
- dest_node_id: 0
length: '6.000000'
length: '6'
src_node_id: 1
- dest_node_id: 1
length: '0.000000'
length: '0'
src_node_id: 1
- dest_node_id: 3
length: '5.000000'
length: '5'
src_node_id: 1
- dest_node_id: 4
length: inf
Expand All @@ -36,7 +36,7 @@ output:
length: inf
src_node_id: 1
- dest_node_id: 3
length: '0.000000'
length: '0'
src_node_id: 3
- dest_node_id: 5
length: inf
Expand All @@ -45,10 +45,10 @@ output:
length: inf
src_node_id: 3
- dest_node_id: 1
length: '5.000000'
length: '5'
src_node_id: 3
- dest_node_id: 0
length: '11.000000'
length: '11'
src_node_id: 3
- dest_node_id: 0
length: inf
Expand All @@ -60,10 +60,10 @@ output:
length: inf
src_node_id: 4
- dest_node_id: 4
length: '0.000000'
length: '0'
src_node_id: 4
- dest_node_id: 5
length: '7.000000'
length: '7'
src_node_id: 4
- dest_node_id: 0
length: inf
Expand All @@ -75,8 +75,8 @@ output:
length: inf
src_node_id: 5
- dest_node_id: 4
length: '7.000000'
length: '7'
src_node_id: 5
- dest_node_id: 5
length: '0.000000'
length: '0'
src_node_id: 5

0 comments on commit a07db33

Please sign in to comment.