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

MDLCSR construct (fixed Jeageun's bug) #17

Closed
wants to merge 28 commits into from
Closed

MDLCSR construct (fixed Jeageun's bug) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
123f946
Jeageun/mdlcsr construct construct (#8)
jeageun Apr 3, 2024
45762f8
minor bug fix
ywwu928 Apr 4, 2024
0b4fa5e
Early exit to reduce the time and pass timeout
jeageun Apr 4, 2024
e687a66
Use hashtable instead of array during test
jeageun Apr 4, 2024
eb0eaa7
Fix bug and performance issue on the test
jeageun Apr 4, 2024
aeb3aa2
Increase Hostlocalstorage heap size
jeageun Apr 4, 2024
c4ac8b0
Remove heavy comparison part
jeageun Apr 4, 2024
ebb23d5
Split tabledata validation and relation validation
jeageun Apr 4, 2024
aa8b24a
Remove the reason for timeout. After discussion with Ying-wei, verify…
jeageun Apr 5, 2024
7be744c
Revert changes
jeageun Apr 5, 2024
03ce181
getLocal to getLocalRef
jeageun Apr 5, 2024
ddb2aa3
Add waitall
jeageun Apr 5, 2024
cc26df4
Revert "Add waitall"
jeageun Apr 5, 2024
480ac63
Revert "getLocal to getLocalRef"
jeageun Apr 5, 2024
58ed4e3
remove get function
jeageun Apr 5, 2024
0b3fc6b
Force to have 3 things to load in validation on python
jeageun Apr 5, 2024
d6cfca7
Thread Local Vectors and Host Cached Arrays (#16)
AdityaAtulTewari Apr 4, 2024
4b8e9cf
Refactor test to be faster (#20)
AdityaAtulTewari Apr 5, 2024
0dcd78a
PerThreadRename: DistArray<HashTable> -> ThreadLocalStorage<HashTable…
AdityaAtulTewari Apr 5, 2024
7120711
Refactor a vector test and make sanitizer tests more accessible (#21)
AdityaAtulTewari Apr 5, 2024
d9302ea
atomics needed some fixes as well as rolling back aggression on sanitize
AdityaAtulTewari Apr 5, 2024
bbb273b
all references work with fmap (#25)
AdityaAtulTewari Apr 5, 2024
a77c6fe
Fix simplelock test (#26)
AdityaAtulTewari Apr 6, 2024
c762cba
Refactor the reading of vertices for partitioning (#23)
AdityaAtulTewari Apr 6, 2024
b9a14d1
rebase
jeageun Apr 6, 2024
c6cdf2a
rebase
jeageun Apr 6, 2024
d187163
update test
jeageun Apr 6, 2024
efaf15f
Bug fix because of PodLocalStorageHeap initialization
jeageun Apr 6, 2024
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
26 changes: 14 additions & 12 deletions .github/workflows/docker.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not my change, it is from rebase.

Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ concurrency:
cancel-in-progress: true

jobs:
prep-smp-ubuntu-2204-docker:
name: gcc / ${{ matrix.build-type }} / ${{ matrix.sanitizer-type }}
prep-mpi-ubuntu-2204-docker:
name: gcc / ${{ matrix.build-type }}
runs-on: self-hosted
permissions:
contents: read
Expand All @@ -35,13 +35,7 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
build-type: ['Release', 'RelWithDebInfo']
sanitizer-type: ['nosan', 'san']
exclude:
- build-type: 'RelWithDebInfo'
sanitizer-type: 'nosan'
- build-type: 'Release'
sanitizer-type: 'san'
build-type: ['Release', 'Sanitize']

steps:

Expand All @@ -60,13 +54,21 @@ jobs:
echo "SRC_DIR=$(pwd)" >> $GITHUB_ENV
echo "PANDO_TEST_DISCOVERY_TIMEOUT=600" >> $GITHUB_ENV
echo "IMAGE_VERSION=$(git log --pretty="%h" -1 Dockerfile.dev)" >> $GITHUB_ENV
if [ ${{ matrix.sanitizer-type }} == 'san' ]; then
if [ ${{ matrix.build-type }} == 'Sanitize' ]; then
echo "PANDO_BUILD_DOCS=OFF" >> $GITHUB_ENV
echo "PANDO_CONTAINER_ENV=-e=PANDO_PREP_L1SP_HART=32768 -ePANDO_PREP_MAIN_NODE=8589934592 -e=PANDO_EXTRA_CXX_FLAGS='\"-fsanitize=address -fsanitize=undefined\"'" >> $GITHUB_ENV
echo "PANDO_CONTAINER_ENV=-e=PANDO_PREP_L1SP_HART=32768 -ePANDO_PREP_MAIN_NODE=8589934592" >> $GITHUB_ENV
fi
if [ ${{ matrix.sanitizer-type }} == 'nosan' ]; then
if [ ${{ matrix.build-type }} == 'Release' ]; then
echo "PANDO_BUILD_DOCS=OFF" >> $GITHUB_ENV
echo "PANDO_CONTAINER_ENV=-e=PANDORT_TESTS=ON" >> $GITHUB_ENV
fi
echo ${{ runner.name }}
if [ ${{ runner.name }} == 'zerberus-0' ]; then
echo "CONTAINER_CPUSET='--cpuset-cpus=0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30'" >> $GITHUB_ENV
fi
if [ ${{ runner.name }} == 'zerberus-1' ]; then
echo "CONTAINER_CPUSET='--cpuset-cpus=1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31'" >> $GITHUB_ENV
fi
cat $GITHUB_ENV

- name: Configure
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/drivex.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not my change, it is from rebase.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
docker-drivex-ubuntu-2204:
name: gcc / ${{ matrix.build-type }} / ${{ matrix.sanitizer-type }}
name: gcc / ${{ matrix.build-type }}
runs-on: self-hosted
permissions:
contents: read
Expand All @@ -36,7 +36,6 @@ jobs:
strategy:
matrix:
build-type: ['Release']
sanitizer-type: ['nosan']

steps:

Expand All @@ -56,6 +55,13 @@ jobs:
echo "PANDO_TEST_DISCOVERY_TIMEOUT=600" >> $GITHUB_ENV
echo "IMAGE_VERSION=$(git log --pretty="%h" -1 Dockerfile.dev)" >> $GITHUB_ENV
echo "PANDO_CONTAINER_ENV=-e=PANDORT_TESTS=ON" >> $GITHUB_ENV
echo ${{ runner.name }}
if [ ${{ runner.name }} == 'zerberus-0' ]; then
echo "CONTAINER_CPUSET='--cpuset-cpus=0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30'" >> $GITHUB_ENV
fi
if [ ${{ runner.name }} == 'zerberus-1' ]; then
echo "CONTAINER_CPUSET='--cpuset-cpus=1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31'" >> $GITHUB_ENV
fi
cat $GITHUB_ENV

- name: Configure
Expand Down
23 changes: 22 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not my change, it is from rebase.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ endif()
option(ENABLE_PANDORT_TESTS "Enable pando-rt to run tests" OFF)

if (NOT ENABLE_PANDORT_TESTS)
message("Not Enabling Pandort testing")
set(BUILD_TESTING_SAVED "${BUILD_TESTING}")
set(BUILD_TESTING OFF)
endif()
Expand All @@ -43,13 +44,33 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
)
endif()

#create the sanitize build type
set(CMAKE_CXX_FLAGS_SANITIZE
"-O2 -g -fsanitize=address -fsanitize=undefined -DNDEBUG" CACHE STRING "Flags used by the C++ compiler during sanitizer builds"
FORCE )
set(CMAKE_C_FLAGS_SANITIZE
"-O2 -g -fsanitize=address -fsanitize=undefined -DNDEBUG" CACHE STRING "Flags used by the C compiler during sanitizer builds"
FORCE )
set(CMAKE_EXE_LINKER_FLAGS_SANITIZE
"" CACHE STRING "Flags used for linking binaries during sanitizer builds"
FORCE )
set(CMAKE_SHARED_LINKER_FLAGS_SANITIZE
"" CACHE STRING "Flags used for linking shared libraries during sanitizer builds"
FORCE )

MARK_AS_ADVANCED(
CMAKE_CXX_FLAGS_SANITIZE
CMAKE_C_FLAGS_SANITIZE
CMAKE_EXE_LINKER_FLAGS_SANITIZE
CMAKE_SHARED_LINKER_FLAGS_SANITIZE)

# default build type
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo" "Sanitize" "Coverage")
set(DEFAULT_BUILD_TYPE "Release")
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to default '${DEFAULT_BUILD_TYPE}' as none was specified.")
set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
# possible values of build type for cmake-gui
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif ()

# target
Expand Down
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is not my change, it is from rebase.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CONTAINER_BUILD_DIR ?= /pando/dockerbuild
CONTAINER_WORKDIR ?= ${CONTAINER_SRC_DIR}
CONTAINER_CONTEXT ?= default
CONTAINER_OPTS ?=
CONTAINER_CPUSET ?=
CONTAINER_CMD ?= setarch `uname -m` -R bash -l
INTERACTIVE ?= i

Expand Down Expand Up @@ -110,6 +111,7 @@ docker:
-v ${SRC_DIR}/:${CONTAINER_SRC_DIR} \
${PANDO_CONTAINER_MOUNTS} \
${PANDO_CONTAINER_ENV} \
${CONTAINER_CPUSET} \
--privileged \
--workdir=${CONTAINER_WORKDIR} ${CONTAINER_OPTS} -${INTERACTIVE}t \
${IMAGE_NAME}:${VERSION} \
Expand Down Expand Up @@ -181,19 +183,19 @@ drive-deps:
run-tests-mpi:
set -o pipefail && \
. ~/.profile && \
cd ${CONTAINER_BUILD_DIR} && ctest -j4 --verbose | tee test.out && \
cd ${CONTAINER_BUILD_DIR} && ctest -j2 --verbose | tee test.out && \
! grep -E "Failure" test.out && ! grep -E "runtime error" test.out

run-tests-smp:
set -o pipefail && \
. ~/.profile && \
cd ${CONTAINER_BUILD_DIR}-smp && ctest -j4 --verbose | tee test.out && \
cd ${CONTAINER_BUILD_DIR}-smp && ctest -j2 --verbose | tee test.out && \
! grep -E "Failure" test.out && ! grep -E "runtime error" test.out

run-tests-drv:
set -o pipefail && \
. ~/.profile && \
cd ${DRV_BUILD_DIR} && ctest -j4 --verbose | tee test.out && \
cd ${DRV_BUILD_DIR} && ctest -j2 --verbose | tee test.out && \
! grep -E "Failure" test.out && ! grep -E "runtime error" test.out

run-tests: run-tests-mpi
Expand Down
33 changes: 33 additions & 0 deletions cmake/PANDOTesting.cmake
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be conflict with #28

Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,36 @@ function(pando_add_bin_test TARGET ARGS INPUTFILE OKFILE)

endif()
endfunction()

function(pando_add_bin_python_test TARGET ARGS INPUTFILE)
if (NOT PANDO_RT_BACKEND STREQUAL "DRVX")
if (${GASNet_CONDUIT} STREQUAL "smp")
set(DRIVER_SCRIPT ${PROJECT_SOURCE_DIR}/pando-rt/scripts/preprun.sh)
elseif (${GASNet_CONDUIT} STREQUAL "mpi")
set(DRIVER_SCRIPT ${PROJECT_SOURCE_DIR}/pando-rt/scripts/preprun_mpi.sh)
else ()
message(FATAL_ERROR "No runner script for GASNet conduit ${GASNet_CONDUIT}")
endif ()

set(NUM_PXNS 2)
set(NUM_CORES 4)

add_test(NAME ${TARGET}-${INPUTFILE}-pythonvalidate
COMMAND bash -c "${DRIVER_SCRIPT} -n ${NUM_PXNS} -c ${NUM_CORES} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET} ${ARGS} ${INPUTFILE} | python3 ${PROJECT_SOURCE_DIR}/scripts/mirror_master_validate.py")

else()

set(DRIVER_SCRIPT ${PROJECT_SOURCE_DIR}/scripts/run-drv.sh)

set(NUM_PXNS 2)
set(NUM_CORES 4)
set(NUM_HTHREADS 8)

get_filename_component(FNAME ${TARGET} NAME)

add_test(NAME ${TARGET}-${INPUTFILE}-pythonvalidate
COMMAND bash -c "LAUNCH_DIR=${CMAKE_SOURCE_DIR} ${DRIVER_SCRIPT} -p ${NUM_HTHREADS} -n ${NUM_PXNS} -c ${NUM_CORES} \
${CMAKE_CURRENT_BINARY_DIR}/lib${FNAME}.so ${ARGS} ${INPUTFILE} | python3 ${PROJECT_SOURCE_DIR}/scripts/mirror_master_validate.py")

endif()
endfunction()
Loading
Loading