Skip to content

Commit 168f910

Browse files
committed
FST: Use new CTF coding by default
1 parent 4579e08 commit 168f910

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

prodtests/full-system-test/dpl-workflow.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ fi
3030
: ${CTF_FREE_DISK_WAIT:="10"} # if disk on EPNs is close to full, wait X seconds before retrying to write
3131
: ${CTF_MAX_FREE_DISK_WAIT:="600"} # if not enough disk space after this time throw error
3232

33-
# entropy encoding/decoding mode, default "" is equivalent to '--ans-version compat' (compatible with < 09/2023 data),
33+
# entropy encoding/decoding mode, '' is equivalent to '--ans-version compat' (compatible with < 09/2023 data),
3434
# use '--ans-version 1.0 --ctf-dict none' for the new per-TF dictionary mode
35-
[[ $EPNSYNCMODE == 1 && -z ${RANS_OPT:-} ]] && RANS_OPT="--ans-version 1.0 --ctf-dict none"
36-
: ${RANS_OPT:=""}
35+
: ${RANS_OPT:="--ans-version 1.0 --ctf-dict none"}
3736

3837
workflow_has_parameter CTF && export SAVECTF=1
3938
workflow_has_parameter GPU && { export GPUTYPE=HIP; export NGPUS=4; }

prodtests/full-system-test/start_tmux.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export SYNCMODE=1
5353
export SHMTHROW=0
5454
export IS_SIMULATED_DATA=1
5555
export DATADIST_NEW_DPL_CHAN=1
56-
export RANS_OPT="--ans-version 1.0 --ctf-dict none" # Use new RANS coding scheme without dictionary
5756

5857
[[ -z $GEN_TOPO_MYDIR ]] && GEN_TOPO_MYDIR="$(dirname $(realpath $0))"
5958
source $GEN_TOPO_MYDIR/setenv.sh || { echo "setenv.sh failed" 1>&2 && exit 1; }

prodtests/full_system_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ if [[ $ENABLE_GPU_TEST != "0" ]]; then
198198
fi
199199
STAGES+=" ASYNC"
200200

201-
if [[ ! $RANS_OPT =~ (--ctf-dict +)(none) ]] ; then
201+
if [[ ${RANS_OPT:-} =~ (--ans-version +)(compat) ]] ; then
202202
# Give a possibility to run the FST with external existing dictionary (i.e. with CREATECTFDICT=0 full_system_test.sh)
203203
# In order to use CCDB dictionaries, pass CTFDICTFILE=ccdb CREATECTFDICT=0
204204
[[ ! -z "$CREATECTFDICT" ]] && SYNCMODEDOCTFDICT="$CREATECTFDICT" || SYNCMODEDOCTFDICT=1

0 commit comments

Comments
 (0)