From a07db333f5f609304f3dab66bb48d4810cf93a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Bari=C5=A1i=C4=87?= <48765171+MarkoBarisic@users.noreply.github.com> Date: Tue, 23 Jan 2024 21:25:02 +0100 Subject: [PATCH] Prepare mage for 1.14 release (#440) * 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 --- .github/workflows/docker_publish.yml | 2 +- .github/workflows/test.yml | 4 +-- .github/workflows/test_no_ml.yml | 2 +- .gitmodules | 2 +- Dockerfile | 2 +- Dockerfile.cugraph | 2 +- Dockerfile.release | 9 +++++-- cpp/memgraph | 2 +- .../test.yml | 26 +++++++++---------- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 7b01af9a5..238682d1a 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4ff1415d..be30f78cd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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"] @@ -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' diff --git a/.github/workflows/test_no_ml.yml b/.github/workflows/test_no_ml.yml index 66f83ff95..209ce20b5 100644 --- a/.github/workflows/test_no_ml.yml +++ b/.github/workflows/test_no_ml.yml @@ -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"] diff --git a/.gitmodules b/.gitmodules index 8027dad9a..be176bd12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Dockerfile b/Dockerfile index 2b7d1273c..24d24965e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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} diff --git a/Dockerfile.cugraph b/Dockerfile.cugraph index 643cf9161..49086f395 100644 --- a/Dockerfile.cugraph +++ b/Dockerfile.cugraph @@ -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 diff --git a/Dockerfile.release b/Dockerfile.release index e5f0e85fc..fc3f35eb5 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -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 @@ -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"] @@ -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"] diff --git a/cpp/memgraph b/cpp/memgraph index 375c3c5dd..474fd43f3 160000 --- a/cpp/memgraph +++ b/cpp/memgraph @@ -1 +1 @@ -Subproject commit 375c3c5dddccd2a9875e6047aecb305e4a719e72 +Subproject commit 474fd43f37bcf32c2d9e33fd616187e53de0272c diff --git a/e2e/igraphalg_test/test_all_shortest_path_length_no_path/test.yml b/e2e/igraphalg_test/test_all_shortest_path_length_no_path/test.yml index b2d0aa3f3..37c43ecc8 100644 --- a/e2e/igraphalg_test/test_all_shortest_path_length_no_path/test.yml +++ b/e2e/igraphalg_test/test_all_shortest_path_length_no_path/test.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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