Skip to content

Commit 25de575

Browse files
rv-jenkinsrv-auditorPetar MaksimovicPetarMax
authored
Update dependency: deps/k_release (#2572)
* deps/k_release: Set Version 7.1.103 * Set Version: 1.0.678 * kevm-pyk/: sync poetry files pyk version 7.1.103 * flake.{nix,lock}: update Nix derivations * renaming parameters --------- Co-authored-by: devops <[email protected]> Co-authored-by: Petar Maksimovic <[email protected]> Co-authored-by: Petar Maksimović <[email protected]>
1 parent 0b75078 commit 25de575

File tree

10 files changed

+50
-29
lines changed

10 files changed

+50
-29
lines changed

deps/k_release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.102
1+
7.1.103

flake.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
description = "A flake for the KEVM Semantics";
33

44
inputs = {
5-
k-framework.url = "github:runtimeverification/k/v7.1.102";
5+
k-framework.url = "github:runtimeverification/k/v7.1.103";
66
nixpkgs.follows = "k-framework/nixpkgs";
77
flake-utils.follows = "k-framework/flake-utils";
88
rv-utils.follows = "k-framework/rv-utils";
9-
pyk.url = "github:runtimeverification/k/v7.1.102?dir=pyk";
9+
pyk.url = "github:runtimeverification/k/v7.1.103?dir=pyk";
1010
nixpkgs-pyk.follows = "pyk/nixpkgs";
1111
poetry2nix.follows = "pyk/poetry2nix";
1212
blockchain-k-plugin = {

kevm-pyk/poetry.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kevm-pyk/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "kevm-pyk"
7-
version = "1.0.677"
7+
version = "1.0.678"
88
description = ""
99
authors = [
1010
"Runtime Verification, Inc. <[email protected]>",
@@ -13,7 +13,7 @@ authors = [
1313
[tool.poetry.dependencies]
1414
python = "^3.10"
1515
pathos = "*"
16-
kframework = "7.1.102"
16+
kframework = "7.1.103"
1717
tomlkit = "^0.11.6"
1818

1919
[tool.poetry.group.dev.dependencies]

kevm-pyk/src/kevm_pyk/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
if TYPE_CHECKING:
66
from typing import Final
77

8-
VERSION: Final = '1.0.677'
8+
VERSION: Final = '1.0.678'

kevm-pyk/src/kevm_pyk/__main__.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ def _init_and_run_proof(claim_job: KClaimJob) -> tuple[bool, list[str] | None]:
301301
kore_rpc_command=kore_rpc_command,
302302
smt_timeout=options.smt_timeout,
303303
smt_retry_limit=options.smt_retry_limit,
304-
trace_rewrites=options.trace_rewrites,
304+
log_succ_rewrites=options.log_succ_rewrites,
305+
log_fail_rewrites=options.log_fail_rewrites,
305306
fallback_on=options.fallback_on,
306307
interim_simplification=options.interim_simplification,
307308
no_post_exec_simplify=(not options.post_exec_simplify),
@@ -319,7 +320,12 @@ def create_kcfg_explore() -> KCFGExplore:
319320
bug_report_id=bug_report_id,
320321
dispatch=dispatch,
321322
)
322-
cterm_symbolic = CTermSymbolic(client, kevm.definition, trace_rewrites=options.trace_rewrites)
323+
cterm_symbolic = CTermSymbolic(
324+
client,
325+
kevm.definition,
326+
log_succ_rewrites=options.log_succ_rewrites,
327+
log_fail_rewrites=options.log_fail_rewrites,
328+
)
323329
return KCFGExplore(
324330
cterm_symbolic,
325331
kcfg_semantics=KEVMSemantics(auto_abstract_gas=options.auto_abstract_gas),
@@ -482,7 +488,8 @@ def exec_section_edge(options: SectionEdgeOptions) -> None:
482488
kore_rpc_command=kore_rpc_command,
483489
smt_timeout=options.smt_timeout,
484490
smt_retry_limit=options.smt_retry_limit,
485-
trace_rewrites=options.trace_rewrites,
491+
log_succ_rewrites=options.log_succ_rewrites,
492+
log_fail_rewrites=options.log_fail_rewrites,
486493
llvm_definition_dir=llvm_definition_dir,
487494
) as kcfg_explore:
488495
node_ids = kcfg_explore.section_edge(

kevm-pyk/src/kevm_pyk/cli.py

+13-4
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@ def get_argument_type() -> dict[str, Callable]:
300300

301301

302302
class RPCOptions(Options):
303-
trace_rewrites: bool
303+
log_succ_rewrites: bool
304+
log_fail_rewrites: bool
304305
kore_rpc_command: str | None
305306
use_booster: bool
306307
fallback_on: list[FallbackReason]
@@ -313,7 +314,8 @@ class RPCOptions(Options):
313314
@staticmethod
314315
def default() -> dict[str, Any]:
315316
return {
316-
'trace_rewrites': False,
317+
'log_succ_rewrites': True,
318+
'log_fail_rewrites': False,
317319
'kore_rpc_command': None,
318320
'use_booster': True,
319321
'fallback_on': [],
@@ -959,8 +961,15 @@ def display_args(self) -> ArgumentParser:
959961
def rpc_args(self) -> ArgumentParser:
960962
args = ArgumentParser(add_help=False)
961963
args.add_argument(
962-
'--trace-rewrites',
963-
dest='trace_rewrites',
964+
'--no-log-rewrites',
965+
dest='log_succ_rewrites',
966+
default=None,
967+
action='store_false',
968+
help='Do not log traces of any simplification and rewrite rule application.',
969+
)
970+
args.add_argument(
971+
'--log-fail-rewrites',
972+
dest='log_fail_rewrites',
964973
default=None,
965974
action='store_true',
966975
help='Log traces of all simplification and rewrite rule applications.',

kevm-pyk/src/kevm_pyk/utils.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,8 @@ def legacy_explore(
348348
haskell_log_entries: Iterable[str] = (),
349349
haskell_threads: int | None = None,
350350
log_axioms_file: Path | None = None,
351-
trace_rewrites: bool = False,
351+
log_succ_rewrites: bool = True,
352+
log_fail_rewrites: bool = True,
352353
start_server: bool = True,
353354
maude_port: int | None = None,
354355
fallback_on: Iterable[FallbackReason] | None = None,
@@ -377,7 +378,9 @@ def legacy_explore(
377378
no_post_exec_simplify=no_post_exec_simplify,
378379
) as server:
379380
with KoreClient('localhost', server.port, bug_report=bug_report, bug_report_id=bug_report_id) as client:
380-
cterm_symbolic = CTermSymbolic(client, kprint.definition, trace_rewrites=trace_rewrites)
381+
cterm_symbolic = CTermSymbolic(
382+
client, kprint.definition, log_succ_rewrites=log_succ_rewrites, log_fail_rewrites=log_fail_rewrites
383+
)
381384
yield KCFGExplore(cterm_symbolic, kcfg_semantics=kcfg_semantics, id=id)
382385
else:
383386
if port is None:
@@ -396,5 +399,7 @@ def legacy_explore(
396399
with KoreClient(
397400
'localhost', port, bug_report=bug_report, bug_report_id=bug_report_id, dispatch=dispatch
398401
) as client:
399-
cterm_symbolic = CTermSymbolic(client, kprint.definition, trace_rewrites=trace_rewrites)
402+
cterm_symbolic = CTermSymbolic(
403+
client, kprint.definition, log_succ_rewrites=log_succ_rewrites, log_fail_rewrites=log_fail_rewrites
404+
)
400405
yield KCFGExplore(cterm_symbolic, kcfg_semantics=kcfg_semantics, id=id)

package/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.677
1+
1.0.678

0 commit comments

Comments
 (0)