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

feat: support for find #18

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: support for find #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
397dee2
feat: support for find
vsoch Feb 15, 2025
fc2e8cd
bug: find can return > 0, should not be called an error
vsoch Feb 15, 2025
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: 2 additions & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && tar -xvf go${G
mv go /usr/local && rm go${GO_VERSION}.linux-amd64.tar.gz
ENV PATH=$PATH:/usr/local/go/bin:/home/vscode/go/bin

RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
RUN git clone -b find-api https://github.com/milroy/flux-sched /opt/flux-sched && \
cd /opt/flux-sched && mkdir build && cd ./build && cmake ../ && make -j4 && make install

# Add the group and user that match our ids
RUN groupadd -g ${USER_GID} ${USERNAME} && \
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
# container base and lib prefix
test: [["fluxrm/flux-sched:noble", "/usr/lib"],
["fluxrm/flux-sched:fedora40", "/usr/lib64"],
["fluxrm/flux-sched:bookworm-amd64", "/usr/lib"],
["fluxrm/flux-sched:el9", "/usr/lib64"]]
["fluxrm/flux-sched:bookworm-amd64", "/usr/lib"]]
# ["fluxrm/flux-sched:el9", "/usr/lib64"]]

container:
image: ${{ matrix.test[0] }}
Expand All @@ -37,12 +37,12 @@ jobs:
go-version: ^1.22

- name: flux-sched build
run: git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
# - name: build flux-sched
# run: |
# here=$(pwd)
# cd /opt/flux-sched
# mkdir build && cd build && cmake ../ && make -j && sudo make install
# cd $here
run: git clone -b find-api https://github.com/milroy/flux-sched /opt/flux-sched
- name: build flux-sched
run: |
here=$(pwd)
cd /opt/flux-sched
mkdir build && cd build && cmake ../ && make -j && sudo make install
cd $here
- name: Test
run: LIB_PREFIX=${{ matrix.test[1] }} make test-v
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test:

.PHONY: test-v
test-v:
# $(COMMONENVVAR) $(BUILDENVVAR) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) go test -count 1 -run TestCancel -v -ldflags '-w' ./pkg/fluxcli ./pkg/types
# $(COMMONENVVAR) $(BUILDENVVAR) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) go test -count 1 -run TestFind -v -ldflags '-w' ./pkg/fluxcli ./pkg/types
$(COMMONENVVAR) $(BUILDENVVAR) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) go test -v -ldflags '-w' ./pkg/fluxcli ./pkg/types

.PHONY: $(LOCALBIN)
Expand Down
35 changes: 35 additions & 0 deletions pkg/fluxcli/data/find/full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
version: 9999
resources:
- type: cluster
count: 1
with:
- type: rack
count: 1
with:
- type: slot
count: 2
label: default
with:
- type: node
count: 1
with:
- type: socket
count: 2
with:
- type: core
count: 18
- type: gpu
count: 1
- type: memory
count: 4

# a comment
attributes:
system:
duration: 3600
tasks:
- command: [ "app" ]
slot: default
count:
per_slot: 1

Loading
Loading