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

Remove unnecessary flags in Legion CMake build (#932) #935

Merged
merged 4 commits into from
Feb 21, 2024
Merged

Remove unnecessary flags in Legion CMake build (#932) #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c939223
Remove unnecessary flags in Legion CMake build (#932)
elliottslaughter Feb 6, 2024
d48ebec
Try adding back --root to see if it still works under ToT legion
manopapad Feb 8, 2024
10e00be
Revert "Try adding back --root to see if it still works under ToT leg…
manopapad Feb 20, 2024
62e37fd
Bump Legion to get legion!1123
manopapad Feb 20, 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
3 changes: 0 additions & 3 deletions cmake/thirdparty/get_legion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ function(find_or_configure_legion)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/cpm_helpers.cmake)
get_cpm_git_args(legion_cpm_git_args REPOSITORY ${git_repo} BRANCH ${git_branch})
if(NOT DEFINED Legion_PYTHON_EXTRA_INSTALL_ARGS)
set(Legion_PYTHON_EXTRA_INSTALL_ARGS "--root / --prefix \"\${CMAKE_INSTALL_PREFIX}\"")
endif()

# Support comma and semicolon delimited lists
string(REPLACE "," " " Legion_PYTHON_EXTRA_INSTALL_ARGS "${Legion_PYTHON_EXTRA_INSTALL_ARGS}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"Legion": {
"git_url" : "https://gitlab.com/StanfordLegion/legion.git",
"git_tag" : "0cbee456b9ee80e494262f663bd4838666bdd0be"
"git_tag" : "ada1f4d6fcb651029798c826ff47a5455d38bc59"
}
}
}
9 changes: 4 additions & 5 deletions src/core/mapping/base_mapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,10 @@ void BaseMapper::map_task(const Legion::Mapping::MapperContext ctx,
map_legate_stores(ctx, task, for_stores, task.target_proc, output_map);
}

void BaseMapper::map_replicate_task(const Legion::Mapping::MapperContext ctx,
const Legion::Task& task,
const MapTaskInput& input,
const MapTaskOutput& def_output,
MapReplicateTaskOutput& output)
void BaseMapper::replicate_task(const Legion::Mapping::MapperContext ctx,
const Legion::Task& task,
const ReplicateTaskInput& input,
ReplicateTaskOutput& output)
{
LEGATE_ABORT;
}
Expand Down
9 changes: 4 additions & 5 deletions src/core/mapping/base_mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,10 @@ class BaseMapper : public Legion::Mapping::Mapper, public MachineQueryInterface
const Legion::Task& task,
const MapTaskInput& input,
MapTaskOutput& output) override;
virtual void map_replicate_task(const Legion::Mapping::MapperContext ctx,
const Legion::Task& task,
const MapTaskInput& input,
const MapTaskOutput& default_output,
MapReplicateTaskOutput& output) override;
virtual void replicate_task(const Legion::Mapping::MapperContext ctx,
const Legion::Task& task,
const ReplicateTaskInput& input,
ReplicateTaskOutput& output) override;
virtual void select_task_variant(const Legion::Mapping::MapperContext ctx,
const Legion::Task& task,
const SelectVariantInput& input,
Expand Down
Loading