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

Jump to bottom

Fix docs build and slightly optimize #63

Merged
merged 1 commit into from
Aug 30, 2023
+9 −6
Merged

Fix docs build and slightly optimize #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ if hasArg clean; then
find ${REPODIR}/python/pylibwholegraph -name "*.cpython*.so" -type f -delete

# remove docs build
rm -rf ${REPODIR}/cpp/html
rm -rf ${REPODIR}/cpp/xml
cd ${REPODIR}/docs/wholegraph
make BUILDDIR=${DOCS_BUILD_DIR} clean
rm -rf ${REPODIR}/docs/wholegraph/_xml
Expand Down Expand Up @@ -303,13 +305,13 @@ if hasArg docs; then
${CMAKE_GENERATOR_OPTION} \
${CMAKE_VERBOSE_OPTION}
fi
cd ${LIBWHOLEGRAPH_BUILD_DIR}
cd ${REPODIR}/cpp
cmake --build "${LIBWHOLEGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target doxygen ${VERBOSE_FLAG}
mkdir -p ${REPODIR}/docs/wholegraph/_html/doxygen_docs/libwholegraph/html
mv ${LIBWHOLEGRAPH_BUILD_DIR}/html/* ${REPODIR}/docs/wholegraph/_html/doxygen_docs/libwholegraph/html
mv ${REPODIR}/cpp/html/* ${REPODIR}/docs/wholegraph/_html/doxygen_docs/libwholegraph/html
mkdir -p ${REPODIR}/docs/wholegraph/_xml
# _xml is used for sphinx breathe project
mv ${LIBWHOLEGRAPH_BUILD_DIR}/xml/* "${REPODIR}/docs/wholegraph/_xml"
mv ${REPODIR}/cpp/xml/* "${REPODIR}/docs/wholegraph/_xml"
cd ${REPODIR}/docs/wholegraph
PYTHONPATH=${REPODIR}/python/pylibwholegraph:${PYTHONPATH} make BUILDDIR=${DOCS_BUILD_DIR} html
mv ${REPODIR}/docs/wholegraph/_html/doxygen_docs ${REPODIR}/docs/wholegraph/${DOCS_BUILD_DIR}/html/
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ rapids_export(
find_package(Doxygen 1.8.11)
if(Doxygen_FOUND)
add_custom_command(OUTPUT WHOLEGRAPH_DOXYGEN
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND doxygen Doxyfile
VERBATIM)

Expand Down
4 changes: 3 additions & 1 deletion cpp/src/wholememory/memory_handle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,9 @@ class global_mapped_host_wholememory_impl : public wholememory_impl {
nullptr, alloc_strategy_.total_alloc_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);
WHOLEMEMORY_CHECK(mmap_ptr != (void*)-1);
#endif
memset(mmap_ptr, 0, alloc_strategy_.total_alloc_size);
memset(static_cast<char*>(mmap_ptr) + rank_partition_strategy_.local_mem_offset,
0,
rank_partition_strategy_.local_mem_size);
WM_CUDA_CHECK_NO_THROW(
cudaHostRegister(mmap_ptr, alloc_strategy_.total_alloc_size, cudaHostRegisterDefault));
#ifndef USE_SYSTEMV_SHM
Expand Down
1 change: 0 additions & 1 deletion python/pylibwholegraph/pylibwholegraph/torch/data_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ def get_train_dataloader(
batch_size=batch_size,
num_workers=num_workers,
pin_memory=True,
prefetch_factor=8 if num_workers > 0 else None,
persistent_workers=True if num_workers > 0 else None,
sampler=train_sampler,
)
Expand Down
Loading