Skip to content

Commit 5ca77f5

Browse files
authored
Add collections functions (#284)
1 parent 00ab5a8 commit 5ca77f5

File tree

132 files changed

+1273
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1273
-6
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
env:
17-
MEMGRAPH_VERSION: 2.9.0
17+
MEMGRAPH_VERSION: 2.10.0
1818
strategy:
1919
matrix:
2020
architecture: ["amd64", "arm64"]

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "cpp/memgraph"]
22
path = cpp/memgraph
33
url = https://github.com/memgraph/memgraph.git
4-
branch = release/2.9
4+
branch = master

Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM debian:bullseye as base
44

55
USER root
66

7-
ARG MG_VERSION=2.9.0
7+
ARG MG_VERSION=2.10.0
88
ARG PY_VERSION_DEFAULT
99
ENV MG_VERSION ${MG_VERSION}
1010
ENV PY_VERSION ${PY_VERSION_DEFAULT}
@@ -35,6 +35,11 @@ RUN apt-get update && apt-get install -y \
3535
&& rm memgraph.deb \
3636
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
3737

38+
# Install required packages from Debian Sid
39+
RUN echo 'deb http://deb.debian.org/debian sid main' > /etc/apt/sources.list.d/debian-sid.list
40+
RUN apt update && apt install -y g++-11 -t sid
41+
42+
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 50
3843

3944
ENV LD_LIBRARY_PATH /usr/lib/memgraph/query_modules
4045

Dockerfile.cugraph

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG CUGRAPH_VERSION=22.02
22
ARG CUDA_VERSION=11.5
33
ARG CUDA_VERSION_MINOR=11.5.2
44
ARG PY_VERSION=3.8
5-
ARG MG_VERSION=2.9.0
5+
ARG MG_VERSION=2.10.0
66

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

@@ -54,6 +54,12 @@ RUN apt-get update && apt-get install -y \
5454
cmake `mage-memgraph` \
5555
--no-install-recommends
5656

57+
# Install required packages from Debian Sid
58+
RUN echo 'deb http://deb.debian.org/debian sid main' > /etc/apt/sources.list.d/debian-sid.list
59+
RUN apt update && apt install -y g++-11 -t sid
60+
61+
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 50
62+
5763
ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/cmake:/usr/lib/cmake
5864

5965
# Memgraph listens for Bolt Protocol on this port by default.

Dockerfile.release

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ WORKDIR /mage
4343
COPY . /mage
4444

4545

46-
4746
#MAGE
4847
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
4948
&& export PATH="/root/.cargo/bin:${PATH}" \

cpp/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set(MEMGRAPH_MAGE_PROJECT_NAME "memgraph-mage")
44
project("${MEMGRAPH_MAGE_PROJECT_NAME}" LANGUAGES C CXX)
55
include(FetchContent)
66

7+
78
# setup CMake module path, defines path for include() and find_package()
89
# https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html
910
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cugraph_cmake)
@@ -18,6 +19,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
1819
set(CMAKE_CXX_STANDARD 20)
1920
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2021

22+
2123
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
2224

2325
# Compile flags.
@@ -143,4 +145,5 @@ add_subdirectory(node_similarity_module)
143145
add_subdirectory(distance_calculator)
144146
add_subdirectory(do_module)
145147
add_subdirectory(periodic_module)
148+
add_subdirectory(collections_module)
146149
add_cugraph_subdirectory(cugraph_module)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
set(collections_src
2+
collections_module.cpp
3+
algorithm/collections.cpp)
4+
5+
add_query_module(collections 1 "${collections_src}")

0 commit comments

Comments
 (0)