From 908f0e472b40513a0c6c3140760f558cb1f7d38a Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Tue, 2 May 2023 09:30:46 +0200 Subject: [PATCH] Fixes for SoA NEURON data structures (#67) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See neuronsimulator/nrn#2027; remove one error message from the diff. Co-authored-by: Alexandru Săvulescu --- modeldb/modeldb-run.yaml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/modeldb/modeldb-run.yaml b/modeldb/modeldb-run.yaml index 13b951d..ae43a75 100644 --- a/modeldb/modeldb-run.yaml +++ b/modeldb/modeldb-run.yaml @@ -340,13 +340,26 @@ - cat mosinit.hoc >> temp - mv temp mosinit.hoc 33975: + # The "interesting" feature of this model is that it produces an error message, roughly: + # We were unable to associate a PlayRecord item with a RANGE variable + # whose format changed after 8.2.2, and which went away in the data structure PR #2027. + # The error going away caused an (empty) gout file to be written, which also caused a diff. + # To avoid false positives, we regex away the error + traceback, and never produce a gout. curate_patterns: - pattern: 'hoc_run1: caught exception: hoc_execerror: We were unable to associate a PlayRecord item with a RANGE variable' repl: '' + - pattern: '%neuron-executable%: We were unable to associate a PlayRecord item with a RANGE variable' + repl: '' + - pattern: ' in %model_dir%/driver.hoc near line 44' + repl: '' + - pattern: '^\s+(finitialize|init|run|stdinit)\((|-65)\)' + repl: '' + - pattern: '^\s+\^' + repl: '' run: - ringperf() - run() - - verify_graph_() + # - verify_graph_() 37856: run: - runiv() @@ -692,15 +705,12 @@ - run() - verify_graph_() 105507: - curate_patterns: - - pattern: '^([0-9.\-e]+) kilocycles$' - repl: '%some_count% kilocycles' run: - load_file("batch_.hoc") - verify_graph_() script: # 424242: this is just avoiding a timing-related number being printed - - sed -i'.bak' -e 's/batch_flag=0/batch_flag=1/g;s/tstop = 1e3/tstop = 20/g;s#return tti/1e3#return 424242#g' batch_.hoc + - sed -i'.bak' -e 's/batch_flag=0/batch_flag=1/g;s/tstop = 1e3/tstop = 20/g;s#return tti/1e3#return 424242#g;s#print tti/.*#print "%some_time%"#g' batch_.hoc 106551: run: - use_mcell_ran4(1)