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

Reorganize runner tests following previous class renaming #2991

Closed
wants to merge 3 commits into from
Closed

Reorganize runner tests following previous class renaming #2991

wants to merge 3 commits into from

Commits on Oct 30, 2024

  1. Rename and reorganize classes (facebook#2977) 

    Summary:
Pull Request resolved: facebook#2977

** Context**
The current structure of the code is such:
* Each `BenchmarkProblem` has a `BenchmarkRunner`
* ` BenchmarkRunner` is the only runner
* A` BenchmarkRunner` has a `ParamBasedTestProblem`, which is either a `BoTorchTestProblem`, `SurrogateTestFunction`, or a special subclass such as `Jenatton`.
The directory structure and names have gotten quite out of touch with the code.

**New class names**
* `ParamBasedTestProblem` -> `TestFunction` (maybe we should call this `BenchmarkTestFunction`?)
* `BoTorchTestProblem` -> `BoTorchTestFunction`

**New directory structure**
| benchmark_problem.py
| problems/
|    | synthetic/hss/jenatton.py
|    | ...
| benchmark_runner.py
| test_function.py
| test_function.py
| test_functions/
|    | botorch_test.py
|    | surrogate.py

Future diffs:
* rename `BenchmarkRunner.test_problem` to `BenchmarkRunner.test_function` (D65088791)

Differential Revision: D64969707

Reviewed By: saitcakmak, Balandat
    @esantorella @facebook-github-bot
    esantorella authored and facebook-github-bot committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    880a444 View commit details
    Browse the repository at this point in the history

  2. Rename test_problem attribute of BenchmarkRunner to `test_functio… 

    …n`, because it is a `BenchmarkTestFunction`

Summary: Rename `test_problem` attribute of `BenchmarkRunner` to `test_function`, because it is a `BenchmarkTestFunction`

Differential Revision: D65088791
    @esantorella @facebook-github-bot
    esantorella authored and facebook-github-bot committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    556c02f View commit details
    Browse the repository at this point in the history

  3. Reorganize runner tests following previous class renaming (facebook#2991 

    )

Summary:
Pull Request resolved: facebook#2991

See D64969707 for context.

This diff:
* Moves the parts of `tests/runners/test_botorch_test_problem` that pertain to the runner into `tests/test_benchmark_runner.py`
* Moves the parts that pertain to `BoTorchTestFunction` to `tests/benchmark_test_functions/test_botorch_test_function.py`
* Moves `tests/runners/test_surrogate_runner.py` to `tests/benchmark_test_functions/test_surrogate_test_function.py`

Reviewed By: Balandat

Differential Revision: D65090663
    @esantorella @facebook-github-bot
    esantorella authored and facebook-github-bot committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    05c52e2 View commit details
    Browse the repository at this point in the history