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

[FIX] Update default CUDA_VERSION and LINUX_VERSION #209

Merged
merged 2 commits into from
May 25, 2021
Merged

[FIX] Update default CUDA_VERSION and LINUX_VERSION #209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56353da
update default CUDA_VERSION to 11.2.2 and LINUX_VERSION to ubuntu20.0…
trxcllnt May 25, 2021
f28b6bd
update to new force_atlas2 API
trxcllnt May 25, 2021
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
2 changes: 1 addition & 1 deletion .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ UID=1000
PARALLEL_LEVEL=8

# `nvidia/cudagl` base image CUDA version
CUDA_VERSION=11.0
CUDA_VERSION=11.2.2

# `nvidia/cudagl` base image Ubuntu version
LINUX_VERSION=ubuntu20.04
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ services:

runtime:
<<: *common_service_settings
image: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.0}-runtime-${LINUX_VERSION:-ubuntu18.04}-amd64
image: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.2.2}-runtime-${LINUX_VERSION:-ubuntu20.04}-amd64
build:
<<: *common_build_settings
dockerfile: dockerfiles/runtime.Dockerfile
args:
<<: *common_build_args
BASE_IMAGE: nvidia/cudagl:${CUDA_VERSION:-11.0}-runtime-${LINUX_VERSION:-ubuntu18.04}
BASE_IMAGE: nvidia/cudagl:${CUDA_VERSION:-11.2.2}-runtime-${LINUX_VERSION:-ubuntu20.04}
volumes:
- &workdir "${PWD}:${PWD}:rw"
- &etc_fonts "/etc/fonts:/etc/fonts:ro"
Expand All @@ -48,7 +48,7 @@ services:

devel:
<<: *common_service_settings
image: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.0}-devel-${LINUX_VERSION:-ubuntu18.04}-amd64
image: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.2.2}-devel-${LINUX_VERSION:-ubuntu20.04}-amd64
build:
<<: *common_build_settings
dockerfile: dockerfiles/devel.Dockerfile
Expand All @@ -58,7 +58,7 @@ services:
PARALLEL_LEVEL: "${PARALLEL_LEVEL:-}"
CMAKE_VERSION: "${CMAKE_VERSION:-3.20.2}"
CCACHE_VERSION: "${CCACHE_VERSION:-4.1}"
BASE_IMAGE: nvidia/cudagl:${CUDA_VERSION:-11.0}-devel-${LINUX_VERSION:-ubuntu18.04}
BASE_IMAGE: nvidia/cudagl:${CUDA_VERSION:-11.2.2}-devel-${LINUX_VERSION:-ubuntu20.04}
environment:
<<: *common_environment_variables
DOCKER_WORKDIR: "${PWD}"
Expand All @@ -80,12 +80,12 @@ services:

nteract:
<<: *common_service_settings
image: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.0}-nteract-${LINUX_VERSION:-ubuntu18.04}-amd64
image: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.2.2}-nteract-${LINUX_VERSION:-ubuntu20.04}-amd64
build:
<<: *common_build_settings
dockerfile: dockerfiles/nteract.Dockerfile
args:
BASE_IMAGE: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.0}-devel-${LINUX_VERSION:-ubuntu18.04}-amd64
BASE_IMAGE: rapidsai/js:${RAPIDS_VERSION:-latest}-cuda${CUDA_VERSION:-11.2.2}-devel-${LINUX_VERSION:-ubuntu20.04}-amd64
environment:
<<: *common_environment_variables
DOCKER_WORKDIR: "${PWD}"
Expand Down
2 changes: 1 addition & 1 deletion docs/setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You can also build and run on a properly configured Linux installation without d

### Dependencies

We assume you have [node, npm](https://github.com/nvm-sh/nvm#installing-and-updating), [yarn](https://yarnpkg.com/getting-started/install), [CMake v3.20.2+](https://cmake.org/), and [CUDA Toolkit 11.0+](https://developer.nvidia.com/cuda-downloads) installed.
We assume you have [node, npm](https://github.com/nvm-sh/nvm#installing-and-updating), [yarn](https://yarnpkg.com/getting-started/install), [CMake v3.20.2+](https://cmake.org/), and [CUDA Toolkit 11.2+](https://developer.nvidia.com/cuda-downloads) installed.

<details>
<summary>Click here to see Ubuntu 16.04+ CMake installation commands:</summary>
Expand Down
9 changes: 2 additions & 7 deletions modules/core/cmake/Modules/ConfigureCUGRAPH.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ function(find_and_configure_cugraph VERSION)
set(BUILD_TESTS OFF)
set(BUILD_BENCHMARKS OFF)

set(NCCL_LIBRARY "/usr/local/cuda/lib64/libnccl.so")
set(NCCL_INCLUDE_DIR "/usr/local/cuda/include")

if(${VERSION} MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=])
set(MAJOR_AND_MINOR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
else()
Expand All @@ -45,10 +42,8 @@ function(find_and_configure_cugraph VERSION)

CPMFindPackage(NAME cugraph
VERSION ${VERSION}
# GIT_REPOSITORY https://github.com/rapidsai/cugraph.git
# GIT_TAG branch-${MAJOR_AND_MINOR}
GIT_REPOSITORY https://github.com/trxcllnt/cugraph.git
GIT_TAG use_rapids_cmake
GIT_REPOSITORY https://github.com/rapidsai/cugraph.git
GIT_TAG branch-${MAJOR_AND_MINOR}
GIT_SHALLOW TRUE
UPDATE_DISCONNECTED FALSE
SOURCE_SUBDIR cpp
Expand Down