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

Allow Objectives to target Objects other than Equilibrium #742

Merged
merged 29 commits into from
Dec 10, 2023

Conversation

dpanici
Copy link
Collaborator

@dpanici dpanici commented Nov 8, 2023

Generalize the changes in the #604 PR to allow objectives to target things that are not an eq, which allows for optimizing objects other than Equilibrium objects (e.g. surfaces, coils, MagneticFields)

To optimize one of these other objects, the corresponding objective must be generalized to not expect only an Equilibrium. normalization.py must also be modified to make normalization scales based off the passed-in object, which may not be an Equilibrium

Objectives which could use a FourierRZToroidalSurface or an Equilibrium:

  • MeanCurvature
  • Volume (same note as above, for "V")
  • PrincipalCurvature

For Future PR (as need other physics quantities, not really needed for this functionality to start working) #795

  • AspectRatio (must make "R0/a" parametrization with FourierRZToroidalSurface first)
  • Elongation (must make "a_major/a_minor" with FourierRZToroidalSurface first)

Copy link
Contributor

github-actions bot commented Nov 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -0.91 +/- 2.49     | -1.45e-04 +/- 3.98e-04 |  1.59e-02 +/- 2.0e-04  |  1.60e-02 +/- 3.4e-04  |
 test_build_transform_fft_midres         |     -0.14 +/- 1.20     | -1.32e-04 +/- 1.16e-03 |  9.68e-02 +/- 9.3e-04  |  9.70e-02 +/- 6.9e-04  |
 test_build_transform_fft_highres        |     -0.34 +/- 1.11     | -1.63e-03 +/- 5.29e-03 |  4.73e-01 +/- 3.2e-03  |  4.75e-01 +/- 4.2e-03  |
 test_equilibrium_init_lowres            |     -1.39 +/- 2.20     | -9.51e-03 +/- 1.50e-02 |  6.74e-01 +/- 1.2e-02  |  6.83e-01 +/- 9.5e-03  |
 test_equilibrium_init_medres            |     -0.32 +/- 1.75     | -3.27e-03 +/- 1.78e-02 |  1.02e+00 +/- 1.5e-02  |  1.02e+00 +/- 9.3e-03  |
 test_equilibrium_init_highres           |     +0.45 +/- 0.86     | +1.16e-02 +/- 2.23e-02 |  2.61e+00 +/- 1.6e-02  |  2.60e+00 +/- 1.6e-02  |
 test_objective_compile_dshape_current   |     +5.14 +/- 6.04     | +2.18e-01 +/- 2.56e-01 |  4.45e+00 +/- 2.2e-01  |  4.23e+00 +/- 1.3e-01  |
 test_objective_compile_atf              |     +1.26 +/- 7.99     | +1.19e-01 +/- 7.58e-01 |  9.61e+00 +/- 6.9e-01  |  9.49e+00 +/- 3.1e-01  |
 test_objective_compute_dshape_current   |     +1.62 +/- 10.34    | +3.66e-05 +/- 2.33e-04 |  2.29e-03 +/- 2.2e-04  |  2.25e-03 +/- 6.6e-05  |
 test_objective_compute_atf              |     +0.07 +/- 3.65     | +5.57e-06 +/- 2.87e-04 |  7.85e-03 +/- 1.6e-04  |  7.84e-03 +/- 2.4e-04  |
 test_objective_jac_dshape_current       |     -4.76 +/- 10.76    | -2.33e-03 +/- 5.26e-03 |  4.65e-02 +/- 3.6e-03  |  4.89e-02 +/- 3.8e-03  |
 test_objective_jac_atf                  |     -4.62 +/- 7.58     | -1.15e-01 +/- 1.88e-01 |  2.36e+00 +/- 1.1e-01  |  2.48e+00 +/- 1.5e-01  |
 test_perturb_1                          |     -4.48 +/- 9.97     | -4.16e-01 +/- 9.27e-01 |  8.87e+00 +/- 6.6e-01  |  9.29e+00 +/- 6.5e-01  |
 test_perturb_2                          |     +0.21 +/- 8.63     | +3.15e-02 +/- 1.32e+00 |  1.53e+01 +/- 7.3e-01  |  1.53e+01 +/- 1.1e+00  |

@dpanici dpanici changed the title Dp/optimizable general Allow Objectives to target Objects other than Equilibrium Nov 8, 2023
Copy link
Contributor

github-actions bot commented Nov 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +2.65 +/- 17.65    | +7.44e-04 +/- 4.95e-03 |  2.88e-02 +/- 4.5e-03  |  2.80e-02 +/- 2.0e-03  |
 test_build_transform_fft_midres         |     -1.22 +/- 10.21    | -1.79e-03 +/- 1.50e-02 |  1.45e-01 +/- 1.3e-02  |  1.47e-01 +/- 7.3e-03  |
 test_build_transform_fft_highres        |     -2.63 +/- 6.92     | -1.86e-02 +/- 4.89e-02 |  6.88e-01 +/- 3.7e-02  |  7.06e-01 +/- 3.2e-02  |
 test_equilibrium_init_lowres            |    +10.15 +/- 8.59     | +1.19e-01 +/- 1.01e-01 |  1.29e+00 +/- 8.4e-02  |  1.17e+00 +/- 5.5e-02  |
 test_equilibrium_init_medres            |     +3.73 +/- 5.03     | +6.57e-02 +/- 8.85e-02 |  1.83e+00 +/- 6.6e-02  |  1.76e+00 +/- 5.9e-02  |
 test_equilibrium_init_highres           |     +1.04 +/- 3.81     | +4.19e-02 +/- 1.54e-01 |  4.09e+00 +/- 7.5e-02  |  4.04e+00 +/- 1.3e-01  |
 test_objective_compile_dshape_current   |     +9.74 +/- 5.95     | +6.29e-01 +/- 3.84e-01 |  7.08e+00 +/- 2.8e-01  |  6.45e+00 +/- 2.6e-01  |
 test_objective_compile_atf              |     +9.13 +/- 5.53     | +1.77e+00 +/- 1.07e+00 |  2.11e+01 +/- 9.0e-01  |  1.94e+01 +/- 5.8e-01  |
 test_objective_compute_dshape_current   |     -5.12 +/- 15.09    | -1.85e-04 +/- 5.46e-04 |  3.43e-03 +/- 2.5e-04  |  3.62e-03 +/- 4.9e-04  |
 test_objective_compute_atf              |     -8.80 +/- 12.97    | -1.12e-03 +/- 1.65e-03 |  1.16e-02 +/- 1.2e-03  |  1.28e-02 +/- 1.2e-03  |
 test_objective_jac_dshape_current       |     -6.93 +/- 20.24    | -9.03e-03 +/- 2.64e-02 |  1.21e-01 +/- 2.4e-02  |  1.30e-01 +/- 1.2e-02  |
 test_objective_jac_atf                  |     +0.89 +/- 6.09     | +7.21e-02 +/- 4.91e-01 |  8.14e+00 +/- 3.4e-01  |  8.06e+00 +/- 3.6e-01  |
 test_perturb_1                          |     -4.85 +/- 9.72     | -6.86e-01 +/- 1.38e+00 |  1.35e+01 +/- 1.0e+00  |  1.41e+01 +/- 9.1e-01  |
 test_perturb_2                          |     -1.37 +/- 9.07     | -3.27e-01 +/- 2.17e+00 |  2.36e+01 +/- 8.8e-01  |  2.39e+01 +/- 2.0e+00  |

Copy link
Contributor

github-actions bot commented Nov 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +2.65 +/- 6.06     | +7.34e-04 +/- 1.68e-03 |  2.85e-02 +/- 1.2e-03  |  2.77e-02 +/- 1.2e-03  |
 test_build_transform_fft_midres         |    +11.44 +/- 5.02     | +1.72e-02 +/- 7.55e-03 |  1.68e-01 +/- 6.5e-03  |  1.51e-01 +/- 3.8e-03  |
-test_build_transform_fft_highres        |     +9.71 +/- 2.85     | +6.74e-02 +/- 1.98e-02 |  7.61e-01 +/- 1.6e-02  |  6.94e-01 +/- 1.2e-02  |
 test_equilibrium_init_lowres            |     -3.28 +/- 2.92     | -3.97e-02 +/- 3.53e-02 |  1.17e+00 +/- 2.7e-02  |  1.21e+00 +/- 2.3e-02  |
 test_equilibrium_init_medres            |     +0.41 +/- 2.54     | +7.40e-03 +/- 4.54e-02 |  1.80e+00 +/- 3.3e-02  |  1.79e+00 +/- 3.1e-02  |
 test_equilibrium_init_highres           |     +5.29 +/- 2.07     | +2.19e-01 +/- 8.55e-02 |  4.35e+00 +/- 5.4e-02  |  4.13e+00 +/- 6.6e-02  |
 test_objective_compile_dshape_current   |     -0.89 +/- 4.50     | -6.46e-02 +/- 3.27e-01 |  7.20e+00 +/- 2.1e-01  |  7.26e+00 +/- 2.5e-01  |
 test_objective_compile_atf              |     -1.78 +/- 3.28     | -3.58e-01 +/- 6.61e-01 |  1.98e+01 +/- 5.3e-01  |  2.01e+01 +/- 3.9e-01  |
 test_objective_compute_dshape_current   |     -5.20 +/- 14.36    | -1.98e-04 +/- 5.46e-04 |  3.61e-03 +/- 1.6e-04  |  3.80e-03 +/- 5.2e-04  |
 test_objective_compute_atf              |     -2.99 +/- 7.05     | -3.77e-04 +/- 8.90e-04 |  1.22e-02 +/- 5.2e-04  |  1.26e-02 +/- 7.2e-04  |
 test_objective_jac_dshape_current       |     +0.70 +/- 9.52     | +8.42e-04 +/- 1.15e-02 |  1.22e-01 +/- 7.8e-03  |  1.21e-01 +/- 8.5e-03  |
 test_objective_jac_atf                  |     -4.71 +/- 3.75     | -3.74e-01 +/- 2.98e-01 |  7.57e+00 +/- 1.9e-01  |  7.95e+00 +/- 2.3e-01  |
 test_perturb_1                          |     -2.42 +/- 7.96     | -3.58e-01 +/- 1.18e+00 |  1.44e+01 +/- 7.9e-01  |  1.48e+01 +/- 8.7e-01  |
 test_perturb_2                          |     -1.97 +/- 7.17     | -5.15e-01 +/- 1.87e+00 |  2.56e+01 +/- 6.9e-01  |  2.61e+01 +/- 1.7e+00  |

Copy link
Contributor

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
-test_build_transform_fft_lowres         |    +11.58 +/- 2.65     | +2.26e-03 +/- 5.19e-04 |  2.18e-02 +/- 3.2e-04  |  1.96e-02 +/- 4.1e-04  |
-test_build_transform_fft_midres         |     +4.16 +/- 0.73     | +4.63e-03 +/- 8.10e-04 |  1.16e-01 +/- 5.4e-04  |  1.11e-01 +/- 6.1e-04  |
-test_build_transform_fft_highres        |     +2.98 +/- 0.76     | +1.53e-02 +/- 3.92e-03 |  5.27e-01 +/- 2.3e-03  |  5.12e-01 +/- 3.1e-03  |
-test_equilibrium_init_lowres            |    +11.83 +/- 1.97     | +1.00e-01 +/- 1.67e-02 |  9.50e-01 +/- 1.4e-02  |  8.49e-01 +/- 8.5e-03  |
-test_equilibrium_init_medres            |    +10.06 +/- 2.14     | +1.27e-01 +/- 2.70e-02 |  1.39e+00 +/- 2.5e-02  |  1.26e+00 +/- 9.0e-03  |
-test_equilibrium_init_highres           |     +7.46 +/- 0.90     | +2.24e-01 +/- 2.71e-02 |  3.22e+00 +/- 1.9e-02  |  3.00e+00 +/- 1.9e-02  |
 test_objective_compile_dshape_current   |    +13.37 +/- 7.26     | +7.02e-01 +/- 3.81e-01 |  5.95e+00 +/- 2.6e-01  |  5.25e+00 +/- 2.7e-01  |
-test_objective_compile_atf              |    +23.55 +/- 4.60     | +3.49e+00 +/- 6.81e-01 |  1.83e+01 +/- 4.6e-01  |  1.48e+01 +/- 5.0e-01  |
-test_objective_compute_dshape_current   |    +30.48 +/- 1.81     | +9.25e-04 +/- 5.50e-05 |  3.96e-03 +/- 4.5e-05  |  3.03e-03 +/- 3.2e-05  |
-test_objective_compute_atf              |    +10.86 +/- 1.40     | +1.10e-03 +/- 1.41e-04 |  1.12e-02 +/- 8.9e-05  |  1.01e-02 +/- 1.1e-04  |
 test_objective_jac_dshape_current       |    +12.61 +/- 9.94     | +1.26e-02 +/- 9.96e-03 |  1.13e-01 +/- 6.8e-03  |  1.00e-01 +/- 7.3e-03  |
 test_objective_jac_atf                  |     -3.61 +/- 33.66    | -2.29e-01 +/- 2.13e+00 |  6.11e+00 +/- 2.1e+00  |  6.34e+00 +/- 2.4e-01  |
 test_perturb_1                          |     +0.32 +/- 11.00    | +3.45e-02 +/- 1.20e+00 |  1.09e+01 +/- 7.7e-01  |  1.09e+01 +/- 9.1e-01  |
 test_perturb_2                          |     -0.63 +/- 6.67     | -1.19e-01 +/- 1.26e+00 |  1.87e+01 +/- 8.9e-01  |  1.89e+01 +/- 8.9e-01  |

Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Merging #742 (564221e) into master (b88f1bd) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #742      +/-   ##
==========================================
+ Coverage   95.08%   95.11%   +0.02%     
==========================================
  Files          80       80              
  Lines       19081    19094      +13     
==========================================
+ Hits        18144    18161      +17     
+ Misses        937      933       -4     
Files Coverage Δ
desc/objectives/_geometry.py 98.43% <100.00%> (+0.32%) ⬆️
desc/objectives/normalization.py 97.56% <100.00%> (+0.89%) ⬆️
desc/optimize/optimizer.py 94.79% <100.00%> (+0.52%) ⬆️

... and 2 files with indirect coverage changes

Copy link
Contributor

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +0.52 +/- 2.15     | +8.05e-05 +/- 3.33e-04 |  1.56e-02 +/- 1.2e-04  |  1.55e-02 +/- 3.1e-04  |
 test_build_transform_fft_midres         |     +0.47 +/- 1.21     | +4.36e-04 +/- 1.13e-03 |  9.41e-02 +/- 7.2e-04  |  9.37e-02 +/- 8.7e-04  |
 test_build_transform_fft_highres        |     +0.63 +/- 0.98     | +2.90e-03 +/- 4.52e-03 |  4.64e-01 +/- 3.4e-03  |  4.61e-01 +/- 3.0e-03  |
 test_equilibrium_init_lowres            |     +0.93 +/- 2.43     | +7.36e-03 +/- 1.93e-02 |  8.02e-01 +/- 1.5e-02  |  7.94e-01 +/- 1.2e-02  |
 test_equilibrium_init_medres            |     +1.36 +/- 2.26     | +1.91e-02 +/- 3.18e-02 |  1.43e+00 +/- 2.8e-02  |  1.41e+00 +/- 1.5e-02  |
 test_equilibrium_init_highres           |     +0.83 +/- 1.26     | +3.49e-02 +/- 5.27e-02 |  4.21e+00 +/- 3.8e-02  |  4.18e+00 +/- 3.6e-02  |
 test_objective_compile_dshape_current   |     -2.77 +/- 8.65     | -1.18e-01 +/- 3.67e-01 |  4.13e+00 +/- 2.7e-01  |  4.25e+00 +/- 2.5e-01  |
 test_objective_compile_atf              |     -5.05 +/- 7.03     | -4.96e-01 +/- 6.91e-01 |  9.33e+00 +/- 4.8e-01  |  9.83e+00 +/- 4.9e-01  |
 test_objective_compute_dshape_current   |    -11.19 +/- 5.70     | -2.74e-04 +/- 1.39e-04 |  2.17e-03 +/- 2.3e-05  |  2.45e-03 +/- 1.4e-04  |
+test_objective_compute_atf              |    -11.45 +/- 3.30     | -9.77e-04 +/- 2.82e-04 |  7.55e-03 +/- 9.5e-05  |  8.53e-03 +/- 2.7e-04  |
 test_objective_jac_dshape_current       |     -5.18 +/- 9.23     | -2.52e-03 +/- 4.49e-03 |  4.62e-02 +/- 2.8e-03  |  4.87e-02 +/- 3.5e-03  |
 test_objective_jac_atf                  |     -7.12 +/- 5.18     | -1.74e-01 +/- 1.27e-01 |  2.27e+00 +/- 5.6e-02  |  2.45e+00 +/- 1.1e-01  |
 test_perturb_1                          |     -6.48 +/- 12.60    | -5.99e-01 +/- 1.16e+00 |  8.63e+00 +/- 7.8e-01  |  9.23e+00 +/- 8.6e-01  |
 test_perturb_2                          |     -6.90 +/- 6.04     | -1.08e+00 +/- 9.42e-01 |  1.45e+01 +/- 4.8e-01  |  1.56e+01 +/- 8.1e-01  |

Copy link
Contributor

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -2.75 +/- 2.31     | -3.49e-04 +/- 2.94e-04 |  1.23e-02 +/- 1.2e-04  |  1.27e-02 +/- 2.7e-04  |
 test_build_transform_fft_midres         |     -1.76 +/- 1.08     | -1.62e-03 +/- 9.97e-04 |  9.05e-02 +/- 4.9e-04  |  9.21e-02 +/- 8.7e-04  |
 test_build_transform_fft_highres        |     -0.21 +/- 0.81     | -9.94e-04 +/- 3.73e-03 |  4.63e-01 +/- 2.5e-03  |  4.64e-01 +/- 2.8e-03  |
 test_equilibrium_init_lowres            |     -4.17 +/- 4.67     | -3.45e-02 +/- 3.87e-02 |  7.92e-01 +/- 7.7e-03  |  8.27e-01 +/- 3.8e-02  |
 test_equilibrium_init_medres            |     -1.21 +/- 1.91     | -1.72e-02 +/- 2.73e-02 |  1.41e+00 +/- 1.9e-02  |  1.43e+00 +/- 2.0e-02  |
 test_equilibrium_init_highres           |     +0.50 +/- 1.02     | +2.08e-02 +/- 4.26e-02 |  4.20e+00 +/- 3.5e-02  |  4.18e+00 +/- 2.4e-02  |
 test_objective_compile_dshape_current   |     +1.30 +/- 8.98     | +5.42e-02 +/- 3.73e-01 |  4.21e+00 +/- 2.4e-01  |  4.16e+00 +/- 2.8e-01  |
 test_objective_compile_atf              |     +0.02 +/- 4.51     | +2.15e-03 +/- 4.16e-01 |  9.23e+00 +/- 3.7e-01  |  9.22e+00 +/- 1.8e-01  |
 test_objective_compute_dshape_current   |     -8.09 +/- 6.99     | -1.93e-04 +/- 1.66e-04 |  2.19e-03 +/- 6.2e-05  |  2.38e-03 +/- 1.5e-04  |
+test_objective_compute_atf              |     -5.29 +/- 1.67     | -4.21e-04 +/- 1.33e-04 |  7.54e-03 +/- 8.4e-05  |  7.96e-03 +/- 1.0e-04  |
 test_objective_jac_dshape_current       |     -1.90 +/- 9.45     | -9.06e-04 +/- 4.50e-03 |  4.67e-02 +/- 2.5e-03  |  4.76e-02 +/- 3.7e-03  |
 test_objective_jac_atf                  |     -3.62 +/- 6.56     | -8.79e-02 +/- 1.59e-01 |  2.34e+00 +/- 8.3e-02  |  2.43e+00 +/- 1.4e-01  |
 test_perturb_1                          |     -5.38 +/- 13.02    | -4.96e-01 +/- 1.20e+00 |  8.73e+00 +/- 7.2e-01  |  9.22e+00 +/- 9.6e-01  |
 test_perturb_2                          |     +2.33 +/- 9.11     | +3.37e-01 +/- 1.32e+00 |  1.48e+01 +/- 6.2e-01  |  1.45e+01 +/- 1.2e+00  |

Copy link
Contributor

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +0.73 +/- 9.61     | +9.12e-05 +/- 1.20e-03 |  1.26e-02 +/- 1.2e-03  |  1.25e-02 +/- 1.9e-04  |
 test_build_transform_fft_midres         |     -0.26 +/- 1.06     | -2.36e-04 +/- 9.69e-04 |  9.16e-02 +/- 7.9e-04  |  9.18e-02 +/- 5.6e-04  |
 test_build_transform_fft_highres        |     +1.72 +/- 1.69     | +7.94e-03 +/- 7.80e-03 |  4.70e-01 +/- 7.2e-03  |  4.62e-01 +/- 3.0e-03  |
 test_equilibrium_init_lowres            |     -0.67 +/- 1.29     | -5.39e-03 +/- 1.04e-02 |  8.03e-01 +/- 6.5e-03  |  8.09e-01 +/- 8.2e-03  |
 test_equilibrium_init_medres            |     -1.81 +/- 1.98     | -2.60e-02 +/- 2.85e-02 |  1.41e+00 +/- 1.5e-02  |  1.44e+00 +/- 2.4e-02  |
 test_equilibrium_init_highres           |     -0.39 +/- 0.94     | -1.63e-02 +/- 3.94e-02 |  4.19e+00 +/- 3.1e-02  |  4.21e+00 +/- 2.5e-02  |
 test_objective_compile_dshape_current   |     -1.46 +/- 9.68     | -6.15e-02 +/- 4.09e-01 |  4.16e+00 +/- 2.7e-01  |  4.22e+00 +/- 3.1e-01  |
 test_objective_compile_atf              |     +0.86 +/- 5.96     | +7.94e-02 +/- 5.53e-01 |  9.36e+00 +/- 4.3e-01  |  9.28e+00 +/- 3.4e-01  |
 test_objective_compute_dshape_current   |     +1.62 +/- 3.89     | +3.47e-05 +/- 8.33e-05 |  2.18e-03 +/- 6.9e-05  |  2.14e-03 +/- 4.6e-05  |
 test_objective_compute_atf              |     +0.28 +/- 1.23     | +2.06e-05 +/- 9.16e-05 |  7.45e-03 +/- 3.7e-05  |  7.43e-03 +/- 8.4e-05  |
 test_objective_jac_dshape_current       |     -1.73 +/- 11.20    | -8.10e-04 +/- 5.24e-03 |  4.60e-02 +/- 2.2e-03  |  4.68e-02 +/- 4.7e-03  |
 test_objective_jac_atf                  |     +1.66 +/- 6.97     | +3.85e-02 +/- 1.62e-01 |  2.36e+00 +/- 9.0e-02  |  2.33e+00 +/- 1.3e-01  |
 test_perturb_1                          |     +1.82 +/- 12.97    | +1.59e-01 +/- 1.14e+00 |  8.92e+00 +/- 7.6e-01  |  8.76e+00 +/- 8.4e-01  |
 test_perturb_2                          |     +0.32 +/- 5.94     | +4.73e-02 +/- 8.72e-01 |  1.47e+01 +/- 6.6e-01  |  1.47e+01 +/- 5.7e-01  |

Copy link
Contributor

github-actions bot commented Dec 6, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +0.78 +/- 2.26     | +9.74e-05 +/- 2.81e-04 |  1.25e-02 +/- 1.4e-04  |  1.24e-02 +/- 2.5e-04  |
 test_build_transform_fft_midres         |     +0.47 +/- 0.97     | +4.28e-04 +/- 8.88e-04 |  9.20e-02 +/- 6.2e-04  |  9.16e-02 +/- 6.4e-04  |
 test_build_transform_fft_highres        |     -0.63 +/- 0.71     | -2.93e-03 +/- 3.31e-03 |  4.61e-01 +/- 2.6e-03  |  4.64e-01 +/- 2.0e-03  |
 test_equilibrium_init_lowres            |     +0.74 +/- 2.01     | +5.93e-03 +/- 1.60e-02 |  8.03e-01 +/- 1.0e-02  |  7.97e-01 +/- 1.2e-02  |
 test_equilibrium_init_medres            |     +0.76 +/- 1.24     | +1.08e-02 +/- 1.76e-02 |  1.43e+00 +/- 1.3e-02  |  1.42e+00 +/- 1.2e-02  |
 test_equilibrium_init_highres           |     +0.05 +/- 0.95     | +1.89e-03 +/- 4.00e-02 |  4.20e+00 +/- 3.0e-02  |  4.19e+00 +/- 2.6e-02  |
 test_objective_compile_dshape_current   |     -0.02 +/- 7.07     | -6.77e-04 +/- 3.09e-01 |  4.37e+00 +/- 1.6e-01  |  4.37e+00 +/- 2.6e-01  |
 test_objective_compile_atf              |     +3.59 +/- 8.26     | +3.30e-01 +/- 7.59e-01 |  9.52e+00 +/- 5.1e-01  |  9.19e+00 +/- 5.6e-01  |
 test_objective_compute_dshape_current   |     +0.94 +/- 2.60     | +2.00e-05 +/- 5.53e-05 |  2.15e-03 +/- 3.6e-05  |  2.13e-03 +/- 4.2e-05  |
 test_objective_compute_atf              |     +0.29 +/- 3.72     | +2.23e-05 +/- 2.82e-04 |  7.60e-03 +/- 2.6e-04  |  7.58e-03 +/- 1.1e-04  |
 test_objective_jac_dshape_current       |     +0.61 +/- 18.91    | +2.92e-04 +/- 9.11e-03 |  4.84e-02 +/- 7.6e-03  |  4.82e-02 +/- 5.1e-03  |
 test_objective_jac_atf                  |     +3.20 +/- 7.36     | +7.09e-02 +/- 1.63e-01 |  2.28e+00 +/- 1.4e-01  |  2.21e+00 +/- 9.1e-02  |
 test_perturb_1                          |     +4.07 +/- 14.89    | +3.50e-01 +/- 1.28e+00 |  8.94e+00 +/- 9.0e-01  |  8.59e+00 +/- 9.1e-01  |
 test_perturb_2                          |     +0.64 +/- 5.41     | +9.40e-02 +/- 7.96e-01 |  1.48e+01 +/- 6.8e-01  |  1.47e+01 +/- 4.2e-01  |

@dpanici
Copy link
Collaborator Author

dpanici commented Dec 7, 2023

@ddudt help me (just name changes and fix tests)

@dpanici dpanici marked this pull request as ready for review December 7, 2023 11:26
Copy link
Contributor

github-actions bot commented Dec 7, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -0.82 +/- 1.21     | -1.02e-04 +/- 1.51e-04 |  1.24e-02 +/- 9.1e-05  |  1.25e-02 +/- 1.2e-04  |
 test_build_transform_fft_midres         |     -0.61 +/- 0.79     | -5.65e-04 +/- 7.36e-04 |  9.24e-02 +/- 3.2e-04  |  9.29e-02 +/- 6.6e-04  |
 test_build_transform_fft_highres        |     +1.81 +/- 0.81     | +8.37e-03 +/- 3.75e-03 |  4.72e-01 +/- 2.9e-03  |  4.63e-01 +/- 2.3e-03  |
 test_equilibrium_init_lowres            |     -2.27 +/- 1.17     | -1.82e-02 +/- 9.41e-03 |  7.85e-01 +/- 4.8e-03  |  8.03e-01 +/- 8.1e-03  |
 test_equilibrium_init_medres            |     -0.62 +/- 1.10     | -8.92e-03 +/- 1.58e-02 |  1.42e+00 +/- 1.2e-02  |  1.43e+00 +/- 9.9e-03  |
 test_equilibrium_init_highres           |     -0.03 +/- 0.74     | -1.17e-03 +/- 3.09e-02 |  4.19e+00 +/- 2.4e-02  |  4.19e+00 +/- 1.9e-02  |
 test_objective_compile_dshape_current   |     +0.14 +/- 8.68     | +6.18e-03 +/- 3.77e-01 |  4.36e+00 +/- 2.5e-01  |  4.35e+00 +/- 2.8e-01  |
 test_objective_compile_atf              |     -0.80 +/- 6.90     | -7.37e-02 +/- 6.36e-01 |  9.15e+00 +/- 4.7e-01  |  9.22e+00 +/- 4.3e-01  |
 test_objective_compute_dshape_current   |     +0.80 +/- 2.15     | +1.69e-05 +/- 4.56e-05 |  2.14e-03 +/- 3.2e-05  |  2.12e-03 +/- 3.2e-05  |
 test_objective_compute_atf              |     +2.64 +/- 1.98     | +1.96e-04 +/- 1.47e-04 |  7.61e-03 +/- 1.2e-04  |  7.42e-03 +/- 8.2e-05  |
 test_objective_jac_dshape_current       |     -2.73 +/- 7.26     | -1.32e-03 +/- 3.51e-03 |  4.70e-02 +/- 2.8e-03  |  4.84e-02 +/- 2.2e-03  |
 test_objective_jac_atf                  |     -4.84 +/- 6.15     | -1.07e-01 +/- 1.36e-01 |  2.11e+00 +/- 9.0e-02  |  2.22e+00 +/- 1.0e-01  |
 test_perturb_1                          |     +0.29 +/- 14.77    | +2.51e-02 +/- 1.29e+00 |  8.78e+00 +/- 9.8e-01  |  8.75e+00 +/- 8.5e-01  |
 test_perturb_2                          |     +4.91 +/- 4.69     | +7.29e-01 +/- 6.96e-01 |  1.56e+01 +/- 4.5e-01  |  1.49e+01 +/- 5.3e-01  |

Copy link
Contributor

github-actions bot commented Dec 7, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -0.93 +/- 1.47     | -1.17e-04 +/- 1.83e-04 |  1.24e-02 +/- 1.4e-04  |  1.25e-02 +/- 1.2e-04  |
 test_build_transform_fft_midres         |     -0.20 +/- 1.02     | -1.82e-04 +/- 9.49e-04 |  9.27e-02 +/- 5.4e-04  |  9.29e-02 +/- 7.8e-04  |
 test_build_transform_fft_highres        |     -1.40 +/- 0.74     | -6.50e-03 +/- 3.45e-03 |  4.58e-01 +/- 2.8e-03  |  4.65e-01 +/- 2.0e-03  |
 test_equilibrium_init_lowres            |     -0.83 +/- 1.59     | -6.65e-03 +/- 1.27e-02 |  7.95e-01 +/- 7.3e-03  |  8.02e-01 +/- 1.0e-02  |
 test_equilibrium_init_medres            |     +0.40 +/- 0.94     | +5.62e-03 +/- 1.32e-02 |  1.42e+00 +/- 1.0e-02  |  1.41e+00 +/- 8.6e-03  |
 test_equilibrium_init_highres           |     +0.61 +/- 0.73     | +2.52e-02 +/- 3.02e-02 |  4.19e+00 +/- 1.8e-02  |  4.16e+00 +/- 2.5e-02  |
 test_objective_compile_dshape_current   |     -0.60 +/- 7.72     | -2.63e-02 +/- 3.38e-01 |  4.36e+00 +/- 2.4e-01  |  4.38e+00 +/- 2.3e-01  |
 test_objective_compile_atf              |     -0.46 +/- 5.80     | -4.27e-02 +/- 5.35e-01 |  9.18e+00 +/- 3.4e-01  |  9.23e+00 +/- 4.1e-01  |
 test_objective_compute_dshape_current   |     +1.34 +/- 3.18     | +2.81e-05 +/- 6.66e-05 |  2.12e-03 +/- 5.2e-05  |  2.09e-03 +/- 4.2e-05  |
 test_objective_compute_atf              |     +0.03 +/- 4.13     | +2.41e-06 +/- 3.07e-04 |  7.43e-03 +/- 3.0e-04  |  7.43e-03 +/- 7.0e-05  |
 test_objective_jac_dshape_current       |     -3.52 +/- 10.26    | -1.68e-03 +/- 4.88e-03 |  4.59e-02 +/- 3.3e-03  |  4.76e-02 +/- 3.6e-03  |
 test_objective_jac_atf                  |     -4.29 +/- 8.90     | -9.70e-02 +/- 2.01e-01 |  2.16e+00 +/- 6.3e-02  |  2.26e+00 +/- 1.9e-01  |
 test_perturb_1                          |     -2.80 +/- 12.65    | -2.47e-01 +/- 1.12e+00 |  8.58e+00 +/- 7.7e-01  |  8.83e+00 +/- 8.1e-01  |
 test_perturb_2                          |     -1.92 +/- 4.23     | -2.87e-01 +/- 6.33e-01 |  1.47e+01 +/- 3.6e-01  |  1.50e+01 +/- 5.2e-01  |

Copy link
Contributor

github-actions bot commented Dec 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -3.71 +/- 4.07     | -4.78e-04 +/- 5.24e-04 |  1.24e-02 +/- 1.5e-04  |  1.29e-02 +/- 5.0e-04  |
 test_build_transform_fft_midres         |     -0.82 +/- 0.87     | -7.56e-04 +/- 8.04e-04 |  9.15e-02 +/- 4.8e-04  |  9.23e-02 +/- 6.4e-04  |
 test_build_transform_fft_highres        |     +0.01 +/- 0.86     | +2.80e-05 +/- 3.97e-03 |  4.64e-01 +/- 2.9e-03  |  4.64e-01 +/- 2.7e-03  |
 test_equilibrium_init_lowres            |     -1.33 +/- 1.90     | -1.09e-02 +/- 1.55e-02 |  8.05e-01 +/- 1.2e-02  |  8.16e-01 +/- 9.9e-03  |
 test_equilibrium_init_medres            |     -1.24 +/- 1.28     | -1.79e-02 +/- 1.85e-02 |  1.42e+00 +/- 1.1e-02  |  1.44e+00 +/- 1.5e-02  |
 test_equilibrium_init_highres           |     -0.91 +/- 1.39     | -3.88e-02 +/- 5.91e-02 |  4.21e+00 +/- 2.8e-02  |  4.25e+00 +/- 5.2e-02  |
 test_objective_compile_dshape_current   |     -1.86 +/- 9.04     | -8.57e-02 +/- 4.17e-01 |  4.52e+00 +/- 3.2e-01  |  4.61e+00 +/- 2.6e-01  |
 test_objective_compile_atf              |     -1.87 +/- 6.42     | -1.77e-01 +/- 6.07e-01 |  9.28e+00 +/- 1.5e-01  |  9.46e+00 +/- 5.9e-01  |
 test_objective_compute_dshape_current   |     -1.42 +/- 3.37     | -3.07e-05 +/- 7.29e-05 |  2.13e-03 +/- 4.1e-05  |  2.16e-03 +/- 6.0e-05  |
 test_objective_compute_atf              |     +2.52 +/- 5.12     | +1.88e-04 +/- 3.83e-04 |  7.67e-03 +/- 3.7e-04  |  7.48e-03 +/- 8.9e-05  |
 test_objective_jac_dshape_current       |     -2.28 +/- 10.36    | -1.10e-03 +/- 4.98e-03 |  4.70e-02 +/- 3.5e-03  |  4.81e-02 +/- 3.6e-03  |
 test_objective_jac_atf                  |     -1.18 +/- 8.44     | -2.64e-02 +/- 1.88e-01 |  2.20e+00 +/- 1.7e-01  |  2.23e+00 +/- 9.0e-02  |
 test_perturb_1                          |     -0.12 +/- 12.67    | -1.02e-02 +/- 1.11e+00 |  8.76e+00 +/- 8.1e-01  |  8.77e+00 +/- 7.6e-01  |
 test_perturb_2                          |     +1.00 +/- 6.48     | +1.50e-01 +/- 9.70e-01 |  1.51e+01 +/- 8.4e-01  |  1.50e+01 +/- 4.9e-01  |

@dpanici dpanici requested a review from f0uriest December 8, 2023 00:47
Copy link
Contributor

github-actions bot commented Dec 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +0.04 +/- 1.78     | +5.40e-06 +/- 2.24e-04 |  1.25e-02 +/- 2.0e-04  |  1.25e-02 +/- 1.1e-04  |
 test_build_transform_fft_midres         |     -0.13 +/- 0.85     | -1.15e-04 +/- 7.76e-04 |  9.12e-02 +/- 6.6e-04  |  9.13e-02 +/- 4.0e-04  |
 test_build_transform_fft_highres        |     +0.83 +/- 0.65     | +3.83e-03 +/- 2.98e-03 |  4.63e-01 +/- 2.3e-03  |  4.59e-01 +/- 1.9e-03  |
 test_equilibrium_init_lowres            |     -0.93 +/- 1.12     | -7.48e-03 +/- 9.01e-03 |  7.95e-01 +/- 7.1e-03  |  8.02e-01 +/- 5.5e-03  |
 test_equilibrium_init_medres            |     -0.10 +/- 0.80     | -1.43e-03 +/- 1.14e-02 |  1.42e+00 +/- 5.3e-03  |  1.42e+00 +/- 1.0e-02  |
 test_equilibrium_init_highres           |     -0.08 +/- 0.92     | -3.52e-03 +/- 3.86e-02 |  4.18e+00 +/- 2.0e-02  |  4.19e+00 +/- 3.3e-02  |
 test_objective_compile_dshape_current   |     -2.33 +/- 8.22     | -1.05e-01 +/- 3.69e-01 |  4.39e+00 +/- 2.5e-01  |  4.49e+00 +/- 2.7e-01  |
 test_objective_compile_atf              |     -3.14 +/- 6.92     | -3.00e-01 +/- 6.61e-01 |  9.26e+00 +/- 5.1e-01  |  9.56e+00 +/- 4.2e-01  |
 test_objective_compute_dshape_current   |     -0.22 +/- 2.50     | -4.71e-06 +/- 5.32e-05 |  2.13e-03 +/- 4.3e-05  |  2.13e-03 +/- 3.1e-05  |
 test_objective_compute_atf              |     -2.06 +/- 0.94     | -1.55e-04 +/- 7.04e-05 |  7.36e-03 +/- 3.7e-05  |  7.52e-03 +/- 6.0e-05  |
 test_objective_jac_dshape_current       |     +6.36 +/- 10.12    | +2.93e-03 +/- 4.66e-03 |  4.90e-02 +/- 2.8e-03  |  4.60e-02 +/- 3.7e-03  |
 test_objective_jac_atf                  |     -3.12 +/- 6.61     | -7.05e-02 +/- 1.49e-01 |  2.19e+00 +/- 1.2e-01  |  2.26e+00 +/- 9.2e-02  |
 test_perturb_1                          |     +0.59 +/- 13.58    | +5.02e-02 +/- 1.16e+00 |  8.62e+00 +/- 8.7e-01  |  8.57e+00 +/- 7.8e-01  |
 test_perturb_2                          |     -0.22 +/- 4.57     | -3.23e-02 +/- 6.69e-01 |  1.46e+01 +/- 4.4e-01  |  1.46e+01 +/- 5.0e-01  |

Copy link
Contributor

github-actions bot commented Dec 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +0.55 +/- 1.23     | +6.82e-05 +/- 1.52e-04 |  1.24e-02 +/- 1.3e-04  |  1.23e-02 +/- 7.0e-05  |
 test_build_transform_fft_midres         |     -0.92 +/- 1.03     | -8.41e-04 +/- 9.41e-04 |  9.06e-02 +/- 6.6e-04  |  9.15e-02 +/- 6.7e-04  |
 test_build_transform_fft_highres        |     -0.22 +/- 0.92     | -1.03e-03 +/- 4.21e-03 |  4.59e-01 +/- 3.1e-03  |  4.60e-01 +/- 2.8e-03  |
 test_equilibrium_init_lowres            |     +0.45 +/- 1.72     | +3.58e-03 +/- 1.37e-02 |  7.98e-01 +/- 1.3e-02  |  7.94e-01 +/- 5.1e-03  |
 test_equilibrium_init_medres            |     +0.00 +/- 1.37     | +5.31e-05 +/- 1.94e-02 |  1.42e+00 +/- 1.1e-02  |  1.42e+00 +/- 1.6e-02  |
 test_equilibrium_init_highres           |     -0.19 +/- 0.97     | -8.14e-03 +/- 4.09e-02 |  4.19e+00 +/- 1.8e-02  |  4.20e+00 +/- 3.7e-02  |
 test_objective_compile_dshape_current   |     +0.52 +/- 7.05     | +2.31e-02 +/- 3.13e-01 |  4.46e+00 +/- 2.1e-01  |  4.44e+00 +/- 2.3e-01  |
 test_objective_compile_atf              |     +0.07 +/- 8.20     | +6.05e-03 +/- 7.62e-01 |  9.30e+00 +/- 5.3e-01  |  9.29e+00 +/- 5.5e-01  |
 test_objective_compute_dshape_current   |     -5.59 +/- 3.20     | -1.26e-04 +/- 7.20e-05 |  2.12e-03 +/- 3.5e-05  |  2.25e-03 +/- 6.3e-05  |
+test_objective_compute_atf              |     -6.10 +/- 1.79     | -4.80e-04 +/- 1.41e-04 |  7.39e-03 +/- 6.4e-05  |  7.87e-03 +/- 1.3e-04  |
 test_objective_jac_dshape_current       |     -8.82 +/- 11.21    | -4.34e-03 +/- 5.51e-03 |  4.49e-02 +/- 4.2e-03  |  4.92e-02 +/- 3.6e-03  |
 test_objective_jac_atf                  |     +0.62 +/- 6.41     | +1.39e-02 +/- 1.44e-01 |  2.26e+00 +/- 8.1e-02  |  2.25e+00 +/- 1.2e-01  |
 test_perturb_1                          |     -3.52 +/- 13.96    | -3.16e-01 +/- 1.26e+00 |  8.68e+00 +/- 8.8e-01  |  8.99e+00 +/- 8.9e-01  |
 test_perturb_2                          |     -4.37 +/- 3.98     | -6.76e-01 +/- 6.16e-01 |  1.48e+01 +/- 4.3e-01  |  1.55e+01 +/- 4.4e-01  |

@dpanici dpanici requested a review from f0uriest December 8, 2023 03:16
Copy link
Contributor

github-actions bot commented Dec 8, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -1.37 +/- 1.65     | -1.72e-04 +/- 2.07e-04 |  1.24e-02 +/- 1.3e-04  |  1.26e-02 +/- 1.6e-04  |
 test_build_transform_fft_midres         |     -0.98 +/- 0.92     | -9.16e-04 +/- 8.63e-04 |  9.28e-02 +/- 5.2e-04  |  9.38e-02 +/- 6.9e-04  |
 test_build_transform_fft_highres        |     +1.29 +/- 1.00     | +5.96e-03 +/- 4.61e-03 |  4.67e-01 +/- 3.1e-03  |  4.61e-01 +/- 3.4e-03  |
 test_equilibrium_init_lowres            |     -1.65 +/- 1.23     | -1.33e-02 +/- 9.87e-03 |  7.91e-01 +/- 5.7e-03  |  8.04e-01 +/- 8.1e-03  |
 test_equilibrium_init_medres            |     -0.40 +/- 1.28     | -5.73e-03 +/- 1.82e-02 |  1.42e+00 +/- 1.0e-02  |  1.42e+00 +/- 1.5e-02  |
 test_equilibrium_init_highres           |     -0.40 +/- 1.00     | -1.67e-02 +/- 4.24e-02 |  4.21e+00 +/- 3.0e-02  |  4.22e+00 +/- 3.0e-02  |
 test_objective_compile_dshape_current   |     -0.63 +/- 9.13     | -2.83e-02 +/- 4.08e-01 |  4.44e+00 +/- 3.1e-01  |  4.46e+00 +/- 2.6e-01  |
 test_objective_compile_atf              |     -1.12 +/- 6.19     | -1.04e-01 +/- 5.74e-01 |  9.17e+00 +/- 4.1e-01  |  9.27e+00 +/- 4.0e-01  |
 test_objective_compute_dshape_current   |     +2.47 +/- 5.35     | +5.30e-05 +/- 1.15e-04 |  2.20e-03 +/- 1.1e-04  |  2.15e-03 +/- 4.5e-05  |
 test_objective_compute_atf              |     +1.52 +/- 1.66     | +1.15e-04 +/- 1.26e-04 |  7.68e-03 +/- 1.1e-04  |  7.56e-03 +/- 6.3e-05  |
 test_objective_jac_dshape_current       |     -1.61 +/- 14.74    | -7.53e-04 +/- 6.90e-03 |  4.60e-02 +/- 5.9e-03  |  4.68e-02 +/- 3.6e-03  |
 test_objective_jac_atf                  |     +0.13 +/- 5.87     | +2.81e-03 +/- 1.30e-01 |  2.21e+00 +/- 8.5e-02  |  2.21e+00 +/- 9.8e-02  |
 test_perturb_1                          |     +0.88 +/- 13.82    | +7.69e-02 +/- 1.20e+00 |  8.77e+00 +/- 8.4e-01  |  8.70e+00 +/- 8.6e-01  |
 test_perturb_2                          |     +1.39 +/- 4.06     | +2.04e-01 +/- 5.98e-01 |  1.49e+01 +/- 4.4e-01  |  1.47e+01 +/- 4.0e-01  |

Copy link
Collaborator

@ddudt ddudt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My main comment is we might want to rename eq to thing to reflect the generalized input parameters.

desc/objectives/_geometry.py Show resolved Hide resolved
@@ -1222,7 +1222,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.11"
"version": "3.8.10"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change necessary?

Copy link
Collaborator Author

@dpanici dpanici Dec 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is just a byproduct of loading and saving jupyter, this is not a real change

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So why is it included in this PR? It's fine, but in the future don't add extra files if you don't need to

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do

(surf), objective, constraints, verbose=3, maxiter=100
)
surf = surf[0]
np.testing.assert_allclose(obj.compute(*obj.xs(surf)), 1, atol=1e-5)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine here, but remember that in general it is almost always better to use relative tolerances.

@dpanici dpanici requested a review from ddudt December 8, 2023 06:17
Copy link
Contributor

github-actions bot commented Dec 9, 2023

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -1.96 +/- 2.15     | -2.47e-04 +/- 2.71e-04 |  1.24e-02 +/- 2.5e-04  |  1.26e-02 +/- 9.4e-05  |
 test_build_transform_fft_midres         |     +0.24 +/- 1.03     | +2.22e-04 +/- 9.32e-04 |  9.11e-02 +/- 5.6e-04  |  9.09e-02 +/- 7.5e-04  |
 test_build_transform_fft_highres        |     +0.10 +/- 1.29     | +4.45e-04 +/- 5.96e-03 |  4.62e-01 +/- 5.4e-03  |  4.61e-01 +/- 2.4e-03  |
 test_equilibrium_init_lowres            |     -1.89 +/- 2.11     | -1.50e-02 +/- 1.68e-02 |  7.81e-01 +/- 1.4e-02  |  7.96e-01 +/- 9.2e-03  |
 test_equilibrium_init_medres            |     -2.67 +/- 1.84     | -3.78e-02 +/- 2.61e-02 |  1.38e+00 +/- 2.5e-02  |  1.42e+00 +/- 8.7e-03  |
 test_equilibrium_init_highres           |     -2.02 +/- 1.18     | -8.44e-02 +/- 4.94e-02 |  4.10e+00 +/- 4.2e-02  |  4.18e+00 +/- 2.6e-02  |
 test_objective_compile_dshape_current   |     -1.66 +/- 8.40     | -7.20e-02 +/- 3.65e-01 |  4.28e+00 +/- 2.6e-01  |  4.35e+00 +/- 2.6e-01  |
 test_objective_compile_atf              |     -0.14 +/- 8.04     | -1.23e-02 +/- 7.30e-01 |  9.06e+00 +/- 4.2e-01  |  9.07e+00 +/- 6.0e-01  |
 test_objective_compute_dshape_current   |     -0.18 +/- 3.31     | -3.78e-06 +/- 6.99e-05 |  2.11e-03 +/- 4.4e-05  |  2.11e-03 +/- 5.4e-05  |
 test_objective_compute_atf              |     -0.75 +/- 3.07     | -5.74e-05 +/- 2.35e-04 |  7.60e-03 +/- 5.7e-05  |  7.66e-03 +/- 2.3e-04  |
 test_objective_jac_dshape_current       |     -0.25 +/- 9.02     | -1.16e-04 +/- 4.18e-03 |  4.63e-02 +/- 2.9e-03  |  4.64e-02 +/- 3.1e-03  |
 test_objective_jac_atf                  |     +2.44 +/- 7.37     | +5.23e-02 +/- 1.58e-01 |  2.19e+00 +/- 9.2e-02  |  2.14e+00 +/- 1.3e-01  |
 test_perturb_1                          |     +1.98 +/- 13.17    | +1.66e-01 +/- 1.10e+00 |  8.54e+00 +/- 7.5e-01  |  8.38e+00 +/- 8.0e-01  |
 test_perturb_2                          |     +1.29 +/- 5.90     | +1.84e-01 +/- 8.40e-01 |  1.44e+01 +/- 4.5e-01  |  1.42e+01 +/- 7.1e-01  |

@dpanici dpanici merged commit 8758ee6 into master Dec 10, 2023
16 checks passed
@dpanici dpanici deleted the dp/optimizable_general branch December 10, 2023 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants