diff --git a/SConstruct b/SConstruct index b5c3f38a7b..478bc885a4 100644 --- a/SConstruct +++ b/SConstruct @@ -44,11 +44,6 @@ AddOption('--external-sconscript', dest='external_sconscript', help='add an external SConscript to the build') -AddOption('--no-thneed', - action='store_true', - dest='no_thneed', - help='avoid using thneed') - AddOption('--pc-thneed', action='store_true', dest='pc_thneed', diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript index 0b89f8a64f..10718c696b 100644 --- a/selfdrive/modeld/SConscript +++ b/selfdrive/modeld/SConscript @@ -23,8 +23,6 @@ thneed_src_qcom = thneed_src_common + ["thneed/thneed_qcom2.cc"] thneed_src_pc = thneed_src_common + ["thneed/thneed_pc.cc"] thneed_src = thneed_src_qcom if arch == "larch64" else thneed_src_pc -use_thneed = not GetOption('no_thneed') - if arch == "larch64": libs += ['gsl', 'CB', 'pthread', 'dl'] else: @@ -52,7 +50,7 @@ for pathdef, fn in {'TRANSFORM': 'transforms/transform.cl', 'LOADYUV': 'transfor for xenv in (lenv, lenvCython): xenv['CXXFLAGS'].append(f'-D{pathdef}_PATH=\\"{File(fn).abspath}\\"') -if (use_thneed and arch == "larch64") or GetOption('pc_thneed'): +if arch == "larch64" or GetOption('pc_thneed'): lenvCython['CFLAGS'].append("-DUSE_THNEED") lenvCython['CXXFLAGS'].append("-DUSE_THNEED") @@ -87,7 +85,7 @@ lenv.Program('_navmodeld', [ ]+common_model, LIBS=libs) # build thneed model -if (use_thneed and arch == "larch64") or GetOption('pc_thneed'): +if arch == "larch64" or GetOption('pc_thneed'): fn = File("models/supercombo").abspath tinygrad_opts = ["NATIVE_EXPLOG=1", "VALIDHACKS=1", "OPTLOCAL=1", "IMAGE=2", "GPU=1", "ENABLE_METHOD_CACHE=1"]