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.

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

Added hypervolume acquisition and constraints #45

Merged
merged 47 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
7fe327c
added constrained acquisition functions
Sep 5, 2023
e608317
added more acquisition functions
Sep 5, 2023
e6ff878
added sirepo-bluesky to deps
Sep 5, 2023
2aa4669
fixed tests
thomaswmorris Sep 5, 2023
4a654f2
choosing acquisition functions
Sep 5, 2023
31bec58
fix deps
Sep 5, 2023
876c5a6
do not test in the docs
Sep 5, 2023
dde3d5f
not all tasks need to be valid
Sep 5, 2023
e2a7eff
not a syntax error but go off i guess
Sep 5, 2023
d5b0547
remove sirepo-bluesky dependency
Sep 5, 2023
a1ce85c
fix deps
Sep 5, 2023
fdfc3bc
conda install srwpy to build docs
thomaswmorris Sep 6, 2023
ff2f89d
conda install srwpy to build docs
thomaswmorris Sep 6, 2023
1fc0487
sirepo-bluesky in dev requirements
Sep 6, 2023
b95a762
tests
Sep 6, 2023
793bfe8
deps
Sep 6, 2023
3482a82
apply the minus sign AFTER the logarithm
Sep 6, 2023
4165454
work at ATF
AmbarCRoAl Sep 6, 2023
fef7a8f
use device name for dofs
Sep 7, 2023
b227cf9
optional trigger delay on default acquisition plan
AmbarCRoAl Sep 7, 2023
bdadca1
tweaks
Sep 7, 2023
491b1a8
tweak CI
Sep 11, 2023
f36049a
use native python in CI
Sep 11, 2023
c5ebf12
no sirepo in CI for now
Sep 11, 2023
726f2c9
no sirepo in CI for now
Sep 11, 2023
9c5fd1e
some plots work
Sep 12, 2023
1b15212
plot work
Sep 13, 2023
6292351
merge
Sep 13, 2023
57b47fa
able to specify which dimensions to treat as latent
Sep 14, 2023
252604b
old plots
Sep 14, 2023
1b73fd4
iss tweaks
Sep 21, 2023
fa8a1a4
fix routing bug
Sep 21, 2023
e146d01
actually fix routing bug
Sep 21, 2023
7234fd9
wrong dimensiongit add .
Sep 21, 2023
a7d548e
why did we get rid of acquisition plots???
Sep 22, 2023
dd6aff8
tweaks
Sep 25, 2023
1ef41b9
Merge pull request #2 from thomaswmorris/specify-latent-dims
thomaswmorris Sep 25, 2023
0ae763d
all dofs if no tags
Sep 25, 2023
b9efa2b
CI: install packages via built-in system Python (not conda)
mrakitin Sep 25, 2023
ee4083d
Merge pull request #3 from mrakitin/improve-ci
thomaswmorris Sep 25, 2023
77cf323
beam image parser
Sep 25, 2023
a2964d9
Merge branch 'hypervolume' of github.com:thomaswmorris/bloptools into…
Sep 25, 2023
ba97d08
beam image parser bug
Sep 25, 2023
a102d54
better parser
Sep 25, 2023
525f466
detach tensors before plotting
Sep 26, 2023
a179894
add .numpy()
Sep 26, 2023
d2ba1d1
tweak the requirements
thomaswmorris Sep 28, 2023
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
42 changes: 26 additions & 16 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ jobs:
with:
fetch-depth: 0

- name: Start MongoDB
uses: supercharge/[email protected]
# - name: Start MongoDB
# uses: supercharge/[email protected]

- name: Start Sirepo Docker container
uses: NSLS-II/start-sirepo-action@v2
with:
docker-binary: docker
# - name: Start Sirepo Docker container
# uses: NSLS-II/start-sirepo-action@v2
# with:
# docker-binary: docker

- name: Copy databroker config file
run: |
set -vxeuo pipefail
mkdir -v -p ~/.config/databroker/
wget https://raw.githubusercontent.com/NSLS-II/sirepo-bluesky/main/examples/local.yml -O ~/.config/databroker/local.yml
# - name: Copy databroker config file
# run: |
# set -vxeuo pipefail
# mkdir -v -p ~/.config/databroker/
# wget https://raw.githubusercontent.com/NSLS-II/sirepo-bluesky/main/examples/local.yml -O ~/.config/databroker/local.yml

- name: Set up Python ${{ matrix.python-version }} with conda
uses: conda-incubator/setup-miniconda@v2
Expand All @@ -57,19 +57,29 @@ jobs:
mamba-version: "*"
channels: conda-forge

- name: Install documentation-building requirements
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install documentation-building requirements with apt/dpkg
run: |
set -vxeuo pipefail
wget --progress=dot:giga "https://github.com/jgm/pandoc/releases/download/3.1.6.1/pandoc-3.1.6.1-1-amd64.deb" -O /tmp/pandoc.deb
sudo dpkg -i /tmp/pandoc.deb
# conda install -c conda-forge -y pandoc
which pandoc
pandoc --version

- name: Install documentation-building requirements with pip
run: |
# For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html.
set -vxeo pipefail

conda env list
# mamba install -c conda-forge shadow3 srwpy pandoc
mamba install -c conda-forge pandoc
pip install --upgrade pip wheel
pip install -v .
pip install -r requirements-dev.txt
pip list
conda list

- name: Build Docs
run: make -C docs/ html
Expand Down
46 changes: 24 additions & 22 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,45 +32,47 @@ jobs:
- name: Checkout the code
uses: actions/checkout@v3

- name: Start MongoDB
uses: supercharge/[email protected]
# - name: Start MongoDB
# uses: supercharge/[email protected]

- name: Start Sirepo Docker container
uses: NSLS-II/start-sirepo-action@v2
with:
docker-binary: docker
# - name: Start Sirepo Docker container
# uses: NSLS-II/start-sirepo-action@v2
# with:
# docker-binary: docker

- name: Copy databroker config file
run: |
set -vxeuo pipefail
mkdir -v -p ~/.config/databroker/
wget https://raw.githubusercontent.com/NSLS-II/sirepo-bluesky/main/examples/local.yml -O ~/.config/databroker/local.yml
# - name: Copy databroker config file
# run: |
# set -vxeuo pipefail
# mkdir -v -p ~/.config/databroker/
# wget https://raw.githubusercontent.com/NSLS-II/sirepo-bluesky/main/examples/local.yml -O ~/.config/databroker/local.yml

# - name: Set up Python ${{ matrix.python-version }} with conda
# uses: conda-incubator/setup-miniconda@v2
# with:
# activate-environment: ${{ env.REPOSITORY_NAME }}-py${{ matrix.python-version }}
# auto-update-conda: true
# miniconda-version: "latest"
# python-version: ${{ matrix.python-version }}
# mamba-version: "*"
# channels: conda-forge

- name: Set up Python ${{ matrix.python-version }} with conda
uses: conda-incubator/setup-miniconda@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
activate-environment: ${{ env.REPOSITORY_NAME }}-py${{ matrix.python-version }}
auto-update-conda: true
miniconda-version: "latest"
python-version: ${{ matrix.python-version }}
mamba-version: "*"
channels: conda-forge

- name: Install the package and its dependencies
run: |
# For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html.
set -vxeo pipefail

conda env list
# mamba install -c conda-forge shadow3 srwpy
pip install --upgrade pip wheel
pip install -v .
pip install -r requirements-dev.txt
pip list
conda list

- name: Test with pytest
run: |
set -vxeuo pipefail
coverage run -m pytest -vv -s
coverage run -m pytest -vv -s -m test_func
coverage report -m
Loading
Loading