Skip to content

Commit ddef305

Browse files
authored
Merge pull request #1126 from herbie-fp/no-localize
Remove the `localize` pass
2 parents 328a3e6 + 9eb1a33 commit ddef305

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/api/sandbox.rkt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
(define result
287287
(profile-thunk compute-result
288288
#:order 'total
289-
#:delay 0.01
289+
#:delay 0.05
290290
#:render (λ (p order) (set! profile (profile->json p)))))
291291
(struct-copy job-result result [profile profile])]
292292
[else (compute-result)]))

src/config.rkt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
(define default-flags
2626
#hash([precision . ()]
2727
[setup . (simplify search)]
28-
[localize . (costs errors)]
28+
[localize . ()]
2929
[generate . (rr taylor simplify proofs)]
3030
[reduce . (regimes binary-search branch-expressions)]
3131
[rules

src/core/mainloop.rkt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,11 @@
172172
(raise-user-error 'localize!
173173
"No alt chosen. Run (choose-alts!) or (choose-alt! n) to choose one"))
174174

175-
(timeline-event! 'simplify)
176175
(define exprs (map alt-expr (^next-alts^)))
177-
(define localized-exprs empty)
178-
(define repr (context-repr (*context*)))
176+
(^locs^ '())
179177

180178
(when (flag-set? 'localize 'costs)
179+
(timeline-event! 'simplify)
181180
(define loc-costss (batch-localize-costs exprs (*context*)))
182181
(define cost-localized
183182
(for/list ([loc-costs (in-list loc-costss)]
@@ -189,10 +188,10 @@
189188
"cost-diff"
190189
(if (infinite? cost-diff) "Infinite" cost-diff))
191190
expr))
192-
(set! localized-exprs (remove-duplicates (append localized-exprs cost-localized))))
191+
(^locs^ (remove-duplicates (append (^locs^) cost-localized))))
193192

194-
(timeline-event! 'localize)
195193
(when (flag-set? 'localize 'errors)
194+
(timeline-event! 'localize)
196195
(define loc-errss (batch-localize-errors exprs (*context*)))
197196
;;Timeline will push duplicates
198197
(define error-localized
@@ -202,9 +201,11 @@
202201
[_ (in-range (*localize-expressions-limit*))])
203202
(timeline-push! 'locations (~a expr) "accuracy" (errors-score err))
204203
expr))
205-
(set! localized-exprs (remove-duplicates (append localized-exprs error-localized))))
204+
(^locs^ (remove-duplicates (append (^locs^) error-localized))))
205+
206+
(when (empty? (^locs^))
207+
(^locs^ (remove-duplicates (append-map all-subexpressions exprs))))
206208

207-
(^locs^ localized-exprs)
208209
(void))
209210

210211
;; Converts a patch to full alt with valid history

0 commit comments

Comments
 (0)