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

threads: elastically scale-up #418

Merged
merged 4 commits into from
May 13, 2024
Merged

threads: elastically scale-up #418

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
5878ad1
threads: elastically scale-up
csegarragonz Mar 18, 2024
0c44a40
gh: bump code version
csegarragonz May 6, 2024
df2c945
threads: handle zero-sized requests and preload a la mpi
csegarragonz May 8, 2024
8a6c540
omp: fix race conditions with elastic scaling
csegarragonz May 12, 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
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FAABRIC_VERSION=0.19.0
FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.19.0
FAABRIC_VERSION=0.20.0
FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.20.0
COMPOSE_PROJECT_NAME=faabric-dev
CONAN_CACHE_MOUNT_SOURCE=./conan-cache/
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/faabric:0.19.0
image: faasm.azurecr.io/faabric:0.20.0
env:
DEPLOYMENT_TYPE: gha-ci
steps:
Expand All @@ -34,7 +34,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/faabric:0.19.0
image: faasm.azurecr.io/faabric:0.20.0
steps:
- name: "Check out code"
uses: actions/checkout@v4
Expand All @@ -45,7 +45,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/faabric:0.19.0
image: faasm.azurecr.io/faabric:0.20.0
steps:
- name: "Check out code"
uses: actions/checkout@v4
Expand All @@ -65,7 +65,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/faabric:0.19.0
image: faasm.azurecr.io/faabric:0.20.0
options: --privileged
services:
redis:
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/faabric:0.19.0
image: faasm.azurecr.io/faabric:0.20.0
options: --privileged
services:
redis:
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/faabric:0.19.0
image: faasm.azurecr.io/faabric:0.20.0
services:
redis:
image: redis
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.19.0
0.20.0
7 changes: 7 additions & 0 deletions src/batch-scheduler/BinPackScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,13 @@
auto decisionType = getDecisionType(inFlightReqs, req);
auto sortedHosts = getSortedHosts(hostMap, inFlightReqs, req, decisionType);

// For an OpenMP request with the single host hint, we only consider
// scheduling in one VM
bool isOmp = req->messages_size() > 0 && req->messages(0).isomp();
if (req->singlehosthint() && isOmp) {
sortedHosts.erase(sortedHosts.begin() + 1, sortedHosts.end());

Check warning on line 314 in src/batch-scheduler/BinPackScheduler.cpp

View check run for this annotation

Codecov / codecov/patch

src/batch-scheduler/BinPackScheduler.cpp#L314 

Added line #L314 was not covered by tests
}

// Assign slots from the list (i.e. bin-pack)
auto it = sortedHosts.begin();
int numLeftToSchedule = req->messages_size();
Expand Down
2 changes: 1 addition & 1 deletion src/batch-scheduler/SchedulingDecision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bool SchedulingDecision::isSingleHost() const

std::string thisHost = conf.endpointHost;
std::set<std::string> hostSet(hosts.begin(), hosts.end());
return hostSet.size() == 1;
return hostSet.size() <= 1;
}

void SchedulingDecision::addMessage(const std::string& host,
Expand Down
Loading