Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7399] teem/trunk
|
From: <kin...@us...> - 2025-09-10 19:32:17
|
Revision: 7399
http://sourceforge.net/p/teem/code/7399
Author: kindlmann
Date: 2025-09-10 19:32:15 +0000 (Wed, 10 Sep 2025)
Log Message:
-----------
updating Python/CFFI code for -v2 CMakeLists.txt files
Modified Paths:
--------------
teem/trunk/python/cffi/biffdata/alan.csv
teem/trunk/python/cffi/biffdata/bane.csv
teem/trunk/python/cffi/biffdata/coil.csv
teem/trunk/python/cffi/biffdata/dye.csv
teem/trunk/python/cffi/biffdata/echo.csv
teem/trunk/python/cffi/biffdata/ell.csv
teem/trunk/python/cffi/biffdata/gage.csv
teem/trunk/python/cffi/biffdata/hoover.csv
teem/trunk/python/cffi/biffdata/limn.csv
teem/trunk/python/cffi/biffdata/meet.csv
teem/trunk/python/cffi/biffdata/mite.csv
teem/trunk/python/cffi/biffdata/moss.csv
teem/trunk/python/cffi/biffdata/nrrd.csv
teem/trunk/python/cffi/biffdata/pull.csv
teem/trunk/python/cffi/biffdata/push.csv
teem/trunk/python/cffi/biffdata/seek.csv
teem/trunk/python/cffi/biffdata/ten.csv
teem/trunk/python/cffi/cdef/cdef_air.h
teem/trunk/python/cffi/cdef/cdef_nrrd.h
teem/trunk/python/cffi/teem.py
teem/trunk/src/_util/gen_biffdata.py
teem/trunk/src/air/CMakeLists-v2.txt
Modified: teem/trunk/python/cffi/biffdata/alan.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/alan.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/alan.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
alanUpdate,int,1,0,alan,alan/coreAlan.c:58
alanInit,int,1,0,alan,alan/coreAlan.c:97
alanRun,int,1,0,alan,alan/coreAlan.c:451
Modified: teem/trunk/python/cffi/biffdata/bane.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/bane.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/bane.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
baneClipNew,baneClip *,NULL,0,bane,bane/clip.c:100
baneClipAnswer,int,1,0,bane,bane/clip.c:150
baneClipCopy,baneClip *,NULL,0,bane,bane/clip.c:165
Modified: teem/trunk/python/cffi/biffdata/coil.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/coil.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/coil.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
coilStart,int,1,0,coil,coil/coreCoil.c:285
coilIterate,int,1,0,coil,coil/coreCoil.c:360
coilFinish,int,1,0,coil,coil/coreCoil.c:405
Modified: teem/trunk/python/cffi/biffdata/dye.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/dye.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/dye.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,3 +1,3 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
dyeConvert,int,1,0,dye,dye/convertDye.c:349
dyeColorParse,int,1,0,dye,dye/methodsDye.c:183
Modified: teem/trunk/python/cffi/biffdata/echo.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/echo.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/echo.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
echoThreadStateInit,int,1,0,echo,echo/renderEcho.c:24
echoRTRenderCheck,int,1,0,echo,echo/renderEcho.c:132
echoRTRender,int,1,0,echo,echo/renderEcho.c:407
Modified: teem/trunk/python/cffi/biffdata/ell.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/ell.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/ell.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
ell_Nm_check,int,1,0,ell,ell/genmat.c:23
ell_Nm_tran,int,1,0,ell,ell/genmat.c:57
ell_Nm_mul,int,1,0,ell,ell/genmat.c:102
Modified: teem/trunk/python/cffi/biffdata/gage.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/gage.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/gage.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
gageContextCopy,gageContext *,NULL,0,gage,gage/ctx.c:86
gageKernelSet,int,1,0,gage,gage/ctx.c:197
gagePerVolumeAttach,int,1,0,gage,gage/ctx.c:396
@@ -7,6 +7,11 @@
gageDeconvolveSeparable,int,1,0,gage,gage/deconvolve.c:206
gageKindCheck,int,1,0,gage,gage/kind.c:31
gageKindVolumeCheck,int,1,0,gage,gage/kind.c:216
+gageOptimSigSet,int,1,0,gage,gage/optimsig.c:215
+gageOptimSigContextNew,gageOptimSigContext *,NULL,0,gage,gage/optimsig.c:309
+gageOptimSigCalculate,int,1,0,gage,gage/optimsig.c:1088
+gageOptimSigErrorPlot,int,1,0,gage,gage/optimsig.c:1160
+gageOptimSigErrorPlotSliding,int,1,0,gage,gage/optimsig.c:1251
gageVolumeCheck,int,1,0,gage,gage/pvl.c:34
gagePerVolumeNew,gagePerVolume *,NULL,0,gage,gage/pvl.c:55
gageQueryReset,int,1,0,gage,gage/pvl.c:259
@@ -38,8 +43,3 @@
gageStackBlurGet,int,1,0,gage,gage/stackBlur.c:1595
gageStackBlurManage,int,1,0,gage,gage/stackBlur.c:1696
gageUpdate,int,1,0,gage,gage/update.c:311
-gageOptimSigSet,int,1,0,gage,gage/optimsig.c:215
-gageOptimSigContextNew,gageOptimSigContext *,NULL,0,gage,gage/optimsig.c:309
-gageOptimSigCalculate,int,1,0,gage,gage/optimsig.c:1088
-gageOptimSigErrorPlot,int,1,0,gage,gage/optimsig.c:1160
-gageOptimSigErrorPlotSliding,int,1,0,gage,gage/optimsig.c:1251
Modified: teem/trunk/python/cffi/biffdata/hoover.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/hoover.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/hoover.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,3 +1,3 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
hooverContextCheck,int,1,0,hoover,hoover/methodsHoover.c:51
hooverRender,int,hooverErrInit,0,hoover,hoover/rays.c:357
Modified: teem/trunk/python/cffi/biffdata/limn.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/limn.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/limn.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
limnCameraUpdate,int,1,0,limn,limn/cam.c:31
limnCameraAspectSet,int,1,0,limn,limn/cam.c:128
limnCameraPathMake,int,1,0,limn,limn/cam.c:187
@@ -53,13 +53,6 @@
limnObjectPSDrawConcave,int,1,0,limn,limn/renderLimn.c:312
limnSplineNrrdEvaluate,int,1,0,limn,limn/splineEval.c:321
limnSplineSample,int,1,0,limn,limn/splineEval.c:359
-limnSplineTypeSpecNew,limnSplineTypeSpec *,NULL,0,limn,limn/splineMethods.c:23
-limnSplineNew,limnSpline *,NULL,0,limn,limn/splineMethods.c:122
-limnSplineNrrdCleverFix,int,1,0,limn,limn/splineMethods.c:247
-limnSplineCleverNew,limnSpline *,NULL,0,limn,limn/splineMethods.c:392
-limnSplineUpdate,int,1,0,limn,limn/splineMethods.c:420
-limnSplineTypeSpecParse,limnSplineTypeSpec *,NULL,0,limn,limn/splineMisc.c:220
-limnSplineParse,limnSpline *,NULL,0,limn,limn/splineMisc.c:276
limnCbfPointsNew,limnCbfPoints *,NULL,0,limn,limn/splineFit.c:175
limnCbfPointsCheck,int,1,0,limn,limn/splineFit.c:247
limnCbfCtxPrep,int,1,0,limn,limn/splineFit.c:518
@@ -68,6 +61,13 @@
limnCbfCorners,int,1,0,limn,limn/splineFit.c:1577
limnCbfMulti,int,1,0,limn,limn/splineFit.c:1779
limnCbfGo,int,1,0,limn,limn/splineFit.c:1897
+limnSplineTypeSpecNew,limnSplineTypeSpec *,NULL,0,limn,limn/splineMethods.c:23
+limnSplineNew,limnSpline *,NULL,0,limn,limn/splineMethods.c:122
+limnSplineNrrdCleverFix,int,1,0,limn,limn/splineMethods.c:247
+limnSplineCleverNew,limnSpline *,NULL,0,limn,limn/splineMethods.c:392
+limnSplineUpdate,int,1,0,limn,limn/splineMethods.c:420
+limnSplineTypeSpecParse,limnSplineTypeSpec *,NULL,0,limn,limn/splineMisc.c:220
+limnSplineParse,limnSpline *,NULL,0,limn,limn/splineMisc.c:276
limnObjectWorldHomog,int,1,0,limn,limn/transform.c:23
limnObjectFaceNormals,int,1,0,limn,limn/transform.c:45
limnObjectSpaceTransform,int,1,0,limn,limn/transform.c:208
Modified: teem/trunk/python/cffi/biffdata/meet.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/meet.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/meet.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
meetAirEnumAllCheck,int,1,0,meet,meet/enumall.c:214
meetNrrdKernelAllCheck,int,1,0,meet,meet/meetNrrd.c:234
meetPullVolCopy,meetPullVol *,NULL,0,meet,meet/meetPull.c:42
Modified: teem/trunk/python/cffi/biffdata/mite.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/mite.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/mite.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
miteSample,double,AIR_NAN,0,mite,mite/ray.c:149
miteRenderBegin,int,1,0,mite,mite/renderMite.c:61
miteShadeSpecParse,int,1,0,mite,mite/shade.c:67
Modified: teem/trunk/python/cffi/biffdata/moss.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/moss.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/moss.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
mossImageCheck,int,1,0,moss,moss/methodsMoss.c:72
mossImageAlloc,int,1,0,moss,moss/methodsMoss.c:93
mossSamplerImageSet,int,1,0,moss,moss/sampler.c:24
Modified: teem/trunk/python/cffi/biffdata/nrrd.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/nrrd.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/nrrd.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
nrrdArrayCompare,int,1,0,nrrd,nrrd/accessors.c:515
nrrdApply1DLut,int,1,0,nrrd,nrrd/apply1D.c:432
nrrdApplyMulti1DLut,int,1,0,nrrd,nrrd/apply1D.c:463
@@ -43,6 +43,9 @@
nrrdDeringRadialKernelSet,int,1,0,nrrd,nrrd/deringNrrd.c:268
nrrdDeringThetaKernelSet,int,1,0,nrrd,nrrd/deringNrrd.c:288
nrrdDeringExecute,int,1,0,nrrd,nrrd/deringNrrd.c:748
+nrrdFFTWWisdomRead,int,1,0,nrrd,nrrd/fftNrrd.c:32
+nrrdFFT,int,1,0,nrrd,nrrd/fftNrrd.c:88
+nrrdFFTWWisdomWrite,int,1,0,nrrd,nrrd/fftNrrd.c:285
nrrdCheapMedian,int,1,0,nrrd,nrrd/filt.c:405
nrrdDistanceL2,int,1,0,nrrd,nrrd/filt.c:812
nrrdDistanceL2Biased,int,1,0,nrrd,nrrd/filt.c:824
@@ -121,9 +124,6 @@
nrrdResampleRoundSet,int,1,0,nrrd,nrrd/resampleContext.c:499
nrrdResampleClampSet,int,1,0,nrrd,nrrd/resampleContext.c:516
nrrdResampleExecute,int,1,0,nrrd,nrrd/resampleContext.c:1451
-nrrdFFTWWisdomRead,int,1,0,nrrd,nrrd/fftNrrd.c:32
-nrrdFFT,int,1,0,nrrd,nrrd/fftNrrd.c:88
-nrrdFFTWWisdomWrite,int,1,0,nrrd,nrrd/fftNrrd.c:285
nrrdSimpleResample,int,1,0,nrrd,nrrd/resampleNrrd.c:49
nrrdSpatialResample,int,1,0,nrrd,nrrd/resampleNrrd.c:519
nrrdSpaceSet,int,1,0,nrrd,nrrd/simple.c:81
Modified: teem/trunk/python/cffi/biffdata/pull.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/pull.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/pull.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,14 +1,30 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
pullEnergyPlot,int,1,0,pull,pull/actionPull.c:230
pullBinProcess,int,1,0,pull,pull/actionPull.c:1104
pullGammaLearn,int,1,0,pull,pull/actionPull.c:1139
pullBinsPointAdd,int,1,0,pull,pull/binningPull.c:181
pullBinsPointMaybeAdd,int,1,0,pull,pull/binningPull.c:203
+pullCCFind,int,1,0,pull,pull/ccPull.c:28
+pullCCMeasure,int,1,0,pull,pull/ccPull.c:112
+pullCCSort,int,1,0,pull,pull/ccPull.c:207
pullOutputGetFilter,int,1,0,pull,pull/contextPull.c:379
pullOutputGet,int,1,0,pull,pull/contextPull.c:575
pullPropGet,int,1,0,pull,pull/contextPull.c:588
pullPositionHistoryNrrdGet,int,1,0,pull,pull/contextPull.c:766
pullPositionHistoryPolydataGet,int,1,0,pull,pull/contextPull.c:838
+pullStart,int,1,0,pull,pull/corePull.c:111
+pullFinish,int,1,0,pull,pull/corePull.c:166
+pullRun,int,1,0,pull,pull/corePull.c:333
+pullEnergySpecParse,int,1,0,pull,pull/energy.c:625
+pullInfoSpecAdd,int,1,0,pull,pull/infoPull.c:130
+pullInfoGet,int,1,0,pull,pull/infoPull.c:402
+pullInfoSpecSprint,int,1,0,pull,pull/infoPull.c:447
+pullInitRandomSet,int,1,0,pull,pull/initPull.c:107
+pullInitHaltonSet,int,1,0,pull,pull/initPull.c:125
+pullInitPointPerVoxelSet,int,1,0,pull,pull/initPull.c:144
+pullInitGivenPosSet,int,1,0,pull,pull/initPull.c:172
+pullInitLiveThreshUseSet,int,1,0,pull,pull/initPull.c:186
+pullInitUnequalShapesAllowSet,int,1,0,pull,pull/initPull.c:199
pullIterParmSet,int,1,0,pull,pull/parmPull.c:102
pullSysParmSet,int,1,0,pull,pull/parmPull.c:191
pullFlagSet,int,1,0,pull,pull/parmPull.c:270
@@ -19,33 +35,17 @@
pullCallbackSet,int,1,0,pull,pull/parmPull.c:406
pullInterEnergySet,int,1,0,pull,pull/parmPull.c:431
pullLogAddSet,int,1,0,pull,pull/parmPull.c:492
-pullInitRandomSet,int,1,0,pull,pull/initPull.c:107
-pullInitHaltonSet,int,1,0,pull,pull/initPull.c:125
-pullInitPointPerVoxelSet,int,1,0,pull,pull/initPull.c:144
-pullInitGivenPosSet,int,1,0,pull,pull/initPull.c:172
-pullInitLiveThreshUseSet,int,1,0,pull,pull/initPull.c:186
-pullInitUnequalShapesAllowSet,int,1,0,pull,pull/initPull.c:199
-pullStart,int,1,0,pull,pull/corePull.c:111
-pullFinish,int,1,0,pull,pull/corePull.c:166
-pullRun,int,1,0,pull,pull/corePull.c:333
-pullEnergySpecParse,int,1,0,pull,pull/energy.c:625
-pullInfoSpecAdd,int,1,0,pull,pull/infoPull.c:130
-pullInfoGet,int,1,0,pull,pull/infoPull.c:402
-pullInfoSpecSprint,int,1,0,pull,pull/infoPull.c:447
pullPointNew,pullPoint *,NULL,0,pull,pull/pointPull.c:31
pullProbe,int,1,0,pull,pull/pointPull.c:356
pullPointInitializePerVoxel,int,1,0,pull,pull/pointPull.c:635
pullPointInitializeRandomOrHalton,int,1,0,pull,pull/pointPull.c:820
pullPointInitializeGivenPos,int,1,0,pull,pull/pointPull.c:991
-pullVolumeSingleAdd,int,1,0,pull,pull/volumePull.c:210
-pullVolumeStackAdd,int,1,0,pull,pull/volumePull.c:236
-pullVolumeLookup,const pullVolume *,NULL,0,pull,pull/volumePull.c:473
-pullConstraintScaleRange,int,1,0,pull,pull/volumePull.c:492
-pullCCFind,int,1,0,pull,pull/ccPull.c:28
-pullCCMeasure,int,1,0,pull,pull/ccPull.c:112
-pullCCSort,int,1,0,pull,pull/ccPull.c:207
pullTraceSet,int,1,0,pull,pull/trace.c:243
pullTraceMultiAdd,int,1,0,pull,pull/trace.c:672
pullTraceMultiPlotAdd,int,1,0,pull,pull/trace.c:702
pullTraceMultiWrite,int,1,0,pull,pull/trace.c:1012
pullTraceMultiRead,int,1,0,pull,pull/trace.c:1117
+pullVolumeSingleAdd,int,1,0,pull,pull/volumePull.c:210
+pullVolumeStackAdd,int,1,0,pull,pull/volumePull.c:236
+pullVolumeLookup,const pullVolume *,NULL,0,pull,pull/volumePull.c:473
+pullConstraintScaleRange,int,1,0,pull,pull/volumePull.c:492
Modified: teem/trunk/python/cffi/biffdata/push.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/push.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/push.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
pushOutputGet,int,1,0,push,push/action.c:69
pushBinProcess,int,1,0,push,push/action.c:159
pushBinPointAdd,int,1,0,push,push/binning.c:178
Modified: teem/trunk/python/cffi/biffdata/seek.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/seek.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/seek.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
seekExtract,int,1,0,seek,seek/extract.c:934
seekDataSet,int,1,0,seek,seek/setSeek.c:54
seekSamplesSet,int,1,0,seek,seek/setSeek.c:114
Modified: teem/trunk/python/cffi/biffdata/ten.csv
===================================================================
--- teem/trunk/python/cffi/biffdata/ten.csv 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/biffdata/ten.csv 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,4 @@
-func_name,return_type,error_val(s),mubi,biff_key,filename:linenumber
+func_name,return_type,error_val(s),mubi,biff_key,cfile:linenumber
tenAnisoPlot,int,1,0,ten,ten/aniso.c:1066
tenAnisoVolume,int,1,0,ten,ten/aniso.c:1125
tenAnisoHistogram,int,1,0,ten,ten/aniso.c:1197
@@ -29,6 +29,10 @@
tenEstimate1TensorSingle_f,int,1,0,ten,ten/estimate.c:1738
tenEstimate1TensorSingle_d,int,1,0,ten,ten/estimate.c:1766
tenEstimate1TensorVolume4D,int,1,0,ten,ten/estimate.c:1803
+tenExperSpecGradSingleBValSet,int,1,0,ten,ten/experSpec.c:61
+tenExperSpecGradBValSet,int,1,0,ten,ten/experSpec.c:102
+tenExperSpecFromKeyValueSet,int,1,0,ten,ten/experSpec.c:171
+tenDWMRIKeyValueFromExperSpecSet,int,1,0,ten,ten/experSpec.c:326
tenFiberTraceSet,int,1,0,ten,ten/fiber.c:826
tenFiberTrace,int,1,0,ten,ten/fiber.c:846
tenFiberDirectionNumber,unsigned int,0,0,ten,ten/fiber.c:866
@@ -76,8 +80,13 @@
tenInterpN_d,int,1,0,ten,ten/path.c:303
tenInterpTwoDiscrete_d,int,1,0,ten,ten/path.c:802
tenInterpMulti3D,int,1,0,ten,ten/path.c:952
-tenDwiGageKindSet,int,1,0,ten,ten/tenDwiGage.c:1035
-tenDwiGageKindCheck,int,1,0,ten,ten/tenDwiGage.c:1175
+tenDwiGageKindSet,int,1,0,ten,ten/tenDwiGage.c:1036
+tenDwiGageKindCheck,int,1,0,ten,ten/tenDwiGage.c:1176
+tenModelParse,int,1,0,ten,ten/tenModel.c:61
+tenModelFromAxisLearn,int,1,0,ten,ten/tenModel.c:122
+tenModelSimulate,int,1,0,ten,ten/tenModel.c:160
+tenModelSqeFit,int,1,0,ten,ten/tenModel.c:408
+tenModelConvert,int,1,0,ten,ten/tenModel.c:683
tenTensorCheck,int,1,4,ten,ten/tensor.c:52
tenMeasurementFrameReduce,int,1,0,ten,ten/tensor.c:85
tenExpand2D,int,1,0,ten,ten/tensor.c:155
@@ -87,12 +96,3 @@
tenSlice,int,1,0,ten,ten/tensor.c:629
tenTripleCalc,int,1,0,ten,ten/triple.c:413
tenTripleConvert,int,1,0,ten,ten/triple.c:471
-tenExperSpecGradSingleBValSet,int,1,0,ten,ten/experSpec.c:61
-tenExperSpecGradBValSet,int,1,0,ten,ten/experSpec.c:102
-tenExperSpecFromKeyValueSet,int,1,0,ten,ten/experSpec.c:171
-tenDWMRIKeyValueFromExperSpecSet,int,1,0,ten,ten/experSpec.c:326
-tenModelParse,int,1,0,ten,ten/tenModel.c:61
-tenModelFromAxisLearn,int,1,0,ten,ten/tenModel.c:122
-tenModelSimulate,int,1,0,ten,ten/tenModel.c:160
-tenModelSqeFit,int,1,0,ten,ten/tenModel.c:408
-tenModelConvert,int,1,0,ten,ten/tenModel.c:683
Modified: teem/trunk/python/cffi/cdef/cdef_air.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_air.h 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/cdef/cdef_air.h 2025-09-10 19:32:15 UTC (rev 7399)
@@ -656,14 +656,15 @@
** (as arising from !(NaN-NaN) or !(inf-inf)). BTW GLK is unsure why the current macro
** explicitly casts the result of "!" to int, since "!" already produces an int:
** https://en.cppreference.com/w/c/language/operator_logical. A more straight-forward
-** alternative, which avoids float conversion warnings, would be to use "x-x == x-x".
+** alternative, which avoids float conversion warnings, would be to use "x-x == x-x"
**
-** Configuring with CMake uses teem/CMake/testAIR_EXISTS.c to test this macro (but NOTE:
-** it has to be copy-pasted to there since it can't read air.h), which then produces
+** Configuring with CMake uses teem/CMake/TestAIR_EXISTS.c (and tries to compile it the
+** same as the rest of Teem will be compiled) to test this macro (but NOTE: it has to be
+** copy-pasted to there since it can't read air.h), which then produces
** teem-install-dir/include/teem/airExistsConf.h, which #define's AIR_EXISTS_MACRO_FAILS
-** or not, which controls whether AIR_EXISTS uses the clever macro or the more reliable
-** function call airExists. Still, there may be failure modes untested by
-** testAIR_EXISTS.c, and by the tests in air/airSanity().
+** or not, which controls whether AIR_EXISTS here uses the clever macro or the more
+** reliable function call airExists. There may yet be failure modes untested by
+** TestAIR_EXISTS.c, and by the tests in air/airSanity().
*/
/* ---- BEGIN non-NrrdIO */
/* clang-format off */
Modified: teem/trunk/python/cffi/cdef/cdef_nrrd.h
===================================================================
--- teem/trunk/python/cffi/cdef/cdef_nrrd.h 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/cdef/cdef_nrrd.h 2025-09-10 19:32:15 UTC (rev 7399)
@@ -455,7 +455,7 @@
the parameter vector */
char name[AIR_STRLEN_SMALL + 1];
/* number of parameters needed (# elements in parm[] used) */
- unsigned int numParm; /* HEY: should be "parmNum" in standard convention */
+ unsigned int parmNum;
/* smallest x (x > 0) such that k(y) = 0 for all y > x, y < -x */
double (*support)(const double *parm);
/* integral of kernel from -support to +support */
Modified: teem/trunk/python/cffi/teem.py
===================================================================
--- teem/trunk/python/cffi/teem.py 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/python/cffi/teem.py 2025-09-10 19:32:15 UTC (rev 7399)
@@ -231,6 +231,9 @@
'nrrdDeringRadialKernelSet': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:268'),
'nrrdDeringThetaKernelSet': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:288'),
'nrrdDeringExecute': (_equals_one, 0, b'nrrd', 'nrrd/deringNrrd.c:748'),
+ 'nrrdFFTWWisdomRead': (_equals_one, 0, b'nrrd', 'nrrd/fftNrrd.c:32'),
+ 'nrrdFFT': (_equals_one, 0, b'nrrd', 'nrrd/fftNrrd.c:88'),
+ 'nrrdFFTWWisdomWrite': (_equals_one, 0, b'nrrd', 'nrrd/fftNrrd.c:285'),
'nrrdCheapMedian': (_equals_one, 0, b'nrrd', 'nrrd/filt.c:405'),
'nrrdDistanceL2': (_equals_one, 0, b'nrrd', 'nrrd/filt.c:812'),
'nrrdDistanceL2Biased': (_equals_one, 0, b'nrrd', 'nrrd/filt.c:824'),
@@ -309,9 +312,6 @@
'nrrdResampleRoundSet': (_equals_one, 0, b'nrrd', 'nrrd/resampleContext.c:499'),
'nrrdResampleClampSet': (_equals_one, 0, b'nrrd', 'nrrd/resampleContext.c:516'),
'nrrdResampleExecute': (_equals_one, 0, b'nrrd', 'nrrd/resampleContext.c:1451'),
- 'nrrdFFTWWisdomRead': (_equals_one, 0, b'nrrd', 'nrrd/fftNrrd.c:32'),
- 'nrrdFFT': (_equals_one, 0, b'nrrd', 'nrrd/fftNrrd.c:88'),
- 'nrrdFFTWWisdomWrite': (_equals_one, 0, b'nrrd', 'nrrd/fftNrrd.c:285'),
'nrrdSimpleResample': (_equals_one, 0, b'nrrd', 'nrrd/resampleNrrd.c:49'),
'nrrdSpatialResample': (_equals_one, 0, b'nrrd', 'nrrd/resampleNrrd.c:519'),
'nrrdSpaceSet': (_equals_one, 0, b'nrrd', 'nrrd/simple.c:81'),
@@ -374,6 +374,11 @@
'gageDeconvolveSeparable': (_equals_one, 0, b'gage', 'gage/deconvolve.c:206'),
'gageKindCheck': (_equals_one, 0, b'gage', 'gage/kind.c:31'),
'gageKindVolumeCheck': (_equals_one, 0, b'gage', 'gage/kind.c:216'),
+ 'gageOptimSigSet': (_equals_one, 0, b'gage', 'gage/optimsig.c:215'),
+ 'gageOptimSigContextNew': (_equals_null, 0, b'gage', 'gage/optimsig.c:309'),
+ 'gageOptimSigCalculate': (_equals_one, 0, b'gage', 'gage/optimsig.c:1088'),
+ 'gageOptimSigErrorPlot': (_equals_one, 0, b'gage', 'gage/optimsig.c:1160'),
+ 'gageOptimSigErrorPlotSliding': (_equals_one, 0, b'gage', 'gage/optimsig.c:1251'),
'gageVolumeCheck': (_equals_one, 0, b'gage', 'gage/pvl.c:34'),
'gagePerVolumeNew': (_equals_null, 0, b'gage', 'gage/pvl.c:55'),
'gageQueryReset': (_equals_one, 0, b'gage', 'gage/pvl.c:259'),
@@ -405,11 +410,6 @@
'gageStackBlurGet': (_equals_one, 0, b'gage', 'gage/stackBlur.c:1595'),
'gageStackBlurManage': (_equals_one, 0, b'gage', 'gage/stackBlur.c:1696'),
'gageUpdate': (_equals_one, 0, b'gage', 'gage/update.c:311'),
- 'gageOptimSigSet': (_equals_one, 0, b'gage', 'gage/optimsig.c:215'),
- 'gageOptimSigContextNew': (_equals_null, 0, b'gage', 'gage/optimsig.c:309'),
- 'gageOptimSigCalculate': (_equals_one, 0, b'gage', 'gage/optimsig.c:1088'),
- 'gageOptimSigErrorPlot': (_equals_one, 0, b'gage', 'gage/optimsig.c:1160'),
- 'gageOptimSigErrorPlotSliding': (_equals_one, 0, b'gage', 'gage/optimsig.c:1251'),
'dyeConvert': (_equals_one, 0, b'dye', 'dye/convertDye.c:349'),
'dyeColorParse': (_equals_one, 0, b'dye', 'dye/methodsDye.c:183'),
'baneClipNew': (_equals_null, 0, b'bane', 'bane/clip.c:100'),
@@ -491,13 +491,6 @@
'limnObjectPSDrawConcave': (_equals_one, 0, b'limn', 'limn/renderLimn.c:312'),
'limnSplineNrrdEvaluate': (_equals_one, 0, b'limn', 'limn/splineEval.c:321'),
'limnSplineSample': (_equals_one, 0, b'limn', 'limn/splineEval.c:359'),
- 'limnSplineTypeSpecNew': (_equals_null, 0, b'limn', 'limn/splineMethods.c:23'),
- 'limnSplineNew': (_equals_null, 0, b'limn', 'limn/splineMethods.c:122'),
- 'limnSplineNrrdCleverFix': (_equals_one, 0, b'limn', 'limn/splineMethods.c:247'),
- 'limnSplineCleverNew': (_equals_null, 0, b'limn', 'limn/splineMethods.c:392'),
- 'limnSplineUpdate': (_equals_one, 0, b'limn', 'limn/splineMethods.c:420'),
- 'limnSplineTypeSpecParse': (_equals_null, 0, b'limn', 'limn/splineMisc.c:220'),
- 'limnSplineParse': (_equals_null, 0, b'limn', 'limn/splineMisc.c:276'),
'limnCbfPointsNew': (_equals_null, 0, b'limn', 'limn/splineFit.c:175'),
'limnCbfPointsCheck': (_equals_one, 0, b'limn', 'limn/splineFit.c:247'),
'limnCbfCtxPrep': (_equals_one, 0, b'limn', 'limn/splineFit.c:518'),
@@ -506,6 +499,13 @@
'limnCbfCorners': (_equals_one, 0, b'limn', 'limn/splineFit.c:1577'),
'limnCbfMulti': (_equals_one, 0, b'limn', 'limn/splineFit.c:1779'),
'limnCbfGo': (_equals_one, 0, b'limn', 'limn/splineFit.c:1897'),
+ 'limnSplineTypeSpecNew': (_equals_null, 0, b'limn', 'limn/splineMethods.c:23'),
+ 'limnSplineNew': (_equals_null, 0, b'limn', 'limn/splineMethods.c:122'),
+ 'limnSplineNrrdCleverFix': (_equals_one, 0, b'limn', 'limn/splineMethods.c:247'),
+ 'limnSplineCleverNew': (_equals_null, 0, b'limn', 'limn/splineMethods.c:392'),
+ 'limnSplineUpdate': (_equals_one, 0, b'limn', 'limn/splineMethods.c:420'),
+ 'limnSplineTypeSpecParse': (_equals_null, 0, b'limn', 'limn/splineMisc.c:220'),
+ 'limnSplineParse': (_equals_null, 0, b'limn', 'limn/splineMisc.c:276'),
'limnObjectWorldHomog': (_equals_one, 0, b'limn', 'limn/transform.c:23'),
'limnObjectFaceNormals': (_equals_one, 0, b'limn', 'limn/transform.c:45'),
'limnObjectSpaceTransform': (_equals_one, 0, b'limn', 'limn/transform.c:208'),
@@ -563,6 +563,10 @@
'tenEstimate1TensorSingle_f': (_equals_one, 0, b'ten', 'ten/estimate.c:1738'),
'tenEstimate1TensorSingle_d': (_equals_one, 0, b'ten', 'ten/estimate.c:1766'),
'tenEstimate1TensorVolume4D': (_equals_one, 0, b'ten', 'ten/estimate.c:1803'),
+ 'tenExperSpecGradSingleBValSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:61'),
+ 'tenExperSpecGradBValSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:102'),
+ 'tenExperSpecFromKeyValueSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:171'),
+ 'tenDWMRIKeyValueFromExperSpecSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:326'),
'tenFiberTraceSet': (_equals_one, 0, b'ten', 'ten/fiber.c:826'),
'tenFiberTrace': (_equals_one, 0, b'ten', 'ten/fiber.c:846'),
'tenFiberDirectionNumber': ((lambda rv: 0 == rv), 0, b'ten', 'ten/fiber.c:866'),
@@ -610,8 +614,13 @@
'tenInterpN_d': (_equals_one, 0, b'ten', 'ten/path.c:303'),
'tenInterpTwoDiscrete_d': (_equals_one, 0, b'ten', 'ten/path.c:802'),
'tenInterpMulti3D': (_equals_one, 0, b'ten', 'ten/path.c:952'),
- 'tenDwiGageKindSet': (_equals_one, 0, b'ten', 'ten/tenDwiGage.c:1035'),
- 'tenDwiGageKindCheck': (_equals_one, 0, b'ten', 'ten/tenDwiGage.c:1175'),
+ 'tenDwiGageKindSet': (_equals_one, 0, b'ten', 'ten/tenDwiGage.c:1036'),
+ 'tenDwiGageKindCheck': (_equals_one, 0, b'ten', 'ten/tenDwiGage.c:1176'),
+ 'tenModelParse': (_equals_one, 0, b'ten', 'ten/tenModel.c:61'),
+ 'tenModelFromAxisLearn': (_equals_one, 0, b'ten', 'ten/tenModel.c:122'),
+ 'tenModelSimulate': (_equals_one, 0, b'ten', 'ten/tenModel.c:160'),
+ 'tenModelSqeFit': (_equals_one, 0, b'ten', 'ten/tenModel.c:408'),
+ 'tenModelConvert': (_equals_one, 0, b'ten', 'ten/tenModel.c:683'),
'tenTensorCheck': (_equals_one, 4, b'ten', 'ten/tensor.c:52'),
'tenMeasurementFrameReduce': (_equals_one, 0, b'ten', 'ten/tensor.c:85'),
'tenExpand2D': (_equals_one, 0, b'ten', 'ten/tensor.c:155'),
@@ -621,25 +630,32 @@
'tenSlice': (_equals_one, 0, b'ten', 'ten/tensor.c:629'),
'tenTripleCalc': (_equals_one, 0, b'ten', 'ten/triple.c:413'),
'tenTripleConvert': (_equals_one, 0, b'ten', 'ten/triple.c:471'),
- 'tenExperSpecGradSingleBValSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:61'),
- 'tenExperSpecGradBValSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:102'),
- 'tenExperSpecFromKeyValueSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:171'),
- 'tenDWMRIKeyValueFromExperSpecSet': (_equals_one, 0, b'ten', 'ten/experSpec.c:326'),
- 'tenModelParse': (_equals_one, 0, b'ten', 'ten/tenModel.c:61'),
- 'tenModelFromAxisLearn': (_equals_one, 0, b'ten', 'ten/tenModel.c:122'),
- 'tenModelSimulate': (_equals_one, 0, b'ten', 'ten/tenModel.c:160'),
- 'tenModelSqeFit': (_equals_one, 0, b'ten', 'ten/tenModel.c:408'),
- 'tenModelConvert': (_equals_one, 0, b'ten', 'ten/tenModel.c:683'),
'pullEnergyPlot': (_equals_one, 0, b'pull', 'pull/actionPull.c:230'),
'pullBinProcess': (_equals_one, 0, b'pull', 'pull/actionPull.c:1104'),
'pullGammaLearn': (_equals_one, 0, b'pull', 'pull/actionPull.c:1139'),
'pullBinsPointAdd': (_equals_one, 0, b'pull', 'pull/binningPull.c:181'),
'pullBinsPointMaybeAdd': (_equals_one, 0, b'pull', 'pull/binningPull.c:203'),
+ 'pullCCFind': (_equals_one, 0, b'pull', 'pull/ccPull.c:28'),
+ 'pullCCMeasure': (_equals_one, 0, b'pull', 'pull/ccPull.c:112'),
+ 'pullCCSort': (_equals_one, 0, b'pull', 'pull/ccPull.c:207'),
'pullOutputGetFilter': (_equals_one, 0, b'pull', 'pull/contextPull.c:379'),
'pullOutputGet': (_equals_one, 0, b'pull', 'pull/contextPull.c:575'),
'pullPropGet': (_equals_one, 0, b'pull', 'pull/contextPull.c:588'),
'pullPositionHistoryNrrdGet': (_equals_one, 0, b'pull', 'pull/contextPull.c:766'),
'pullPositionHistoryPolydataGet': (_equals_one, 0, b'pull', 'pull/contextPull.c:838'),
+ 'pullStart': (_equals_one, 0, b'pull', 'pull/corePull.c:111'),
+ 'pullFinish': (_equals_one, 0, b'pull', 'pull/corePull.c:166'),
+ 'pullRun': (_equals_one, 0, b'pull', 'pull/corePull.c:333'),
+ 'pullEnergySpecParse': (_equals_one, 0, b'pull', 'pull/energy.c:625'),
+ 'pullInfoSpecAdd': (_equals_one, 0, b'pull', 'pull/infoPull.c:130'),
+ 'pullInfoGet': (_equals_one, 0, b'pull', 'pull/infoPull.c:402'),
+ 'pullInfoSpecSprint': (_equals_one, 0, b'pull', 'pull/infoPull.c:447'),
+ 'pullInitRandomSet': (_equals_one, 0, b'pull', 'pull/initPull.c:107'),
+ 'pullInitHaltonSet': (_equals_one, 0, b'pull', 'pull/initPull.c:125'),
+ 'pullInitPointPerVoxelSet': (_equals_one, 0, b'pull', 'pull/initPull.c:144'),
+ 'pullInitGivenPosSet': (_equals_one, 0, b'pull', 'pull/initPull.c:172'),
+ 'pullInitLiveThreshUseSet': (_equals_one, 0, b'pull', 'pull/initPull.c:186'),
+ 'pullInitUnequalShapesAllowSet': (_equals_one, 0, b'pull', 'pull/initPull.c:199'),
'pullIterParmSet': (_equals_one, 0, b'pull', 'pull/parmPull.c:102'),
'pullSysParmSet': (_equals_one, 0, b'pull', 'pull/parmPull.c:191'),
'pullFlagSet': (_equals_one, 0, b'pull', 'pull/parmPull.c:270'),
@@ -650,36 +666,20 @@
'pullCallbackSet': (_equals_one, 0, b'pull', 'pull/parmPull.c:406'),
'pullInterEnergySet': (_equals_one, 0, b'pull', 'pull/parmPull.c:431'),
'pullLogAddSet': (_equals_one, 0, b'pull', 'pull/parmPull.c:492'),
- 'pullInitRandomSet': (_equals_one, 0, b'pull', 'pull/initPull.c:107'),
- 'pullInitHaltonSet': (_equals_one, 0, b'pull', 'pull/initPull.c:125'),
- 'pullInitPointPerVoxelSet': (_equals_one, 0, b'pull', 'pull/initPull.c:144'),
- 'pullInitGivenPosSet': (_equals_one, 0, b'pull', 'pull/initPull.c:172'),
- 'pullInitLiveThreshUseSet': (_equals_one, 0, b'pull', 'pull/initPull.c:186'),
- 'pullInitUnequalShapesAllowSet': (_equals_one, 0, b'pull', 'pull/initPull.c:199'),
- 'pullStart': (_equals_one, 0, b'pull', 'pull/corePull.c:111'),
- 'pullFinish': (_equals_one, 0, b'pull', 'pull/corePull.c:166'),
- 'pullRun': (_equals_one, 0, b'pull', 'pull/corePull.c:333'),
- 'pullEnergySpecParse': (_equals_one, 0, b'pull', 'pull/energy.c:625'),
- 'pullInfoSpecAdd': (_equals_one, 0, b'pull', 'pull/infoPull.c:130'),
- 'pullInfoGet': (_equals_one, 0, b'pull', 'pull/infoPull.c:402'),
- 'pullInfoSpecSprint': (_equals_one, 0, b'pull', 'pull/infoPull.c:447'),
'pullPointNew': (_equals_null, 0, b'pull', 'pull/pointPull.c:31'),
'pullProbe': (_equals_one, 0, b'pull', 'pull/pointPull.c:356'),
'pullPointInitializePerVoxel': (_equals_one, 0, b'pull', 'pull/pointPull.c:635'),
'pullPointInitializeRandomOrHalton': (_equals_one, 0, b'pull', 'pull/pointPull.c:820'),
'pullPointInitializeGivenPos': (_equals_one, 0, b'pull', 'pull/pointPull.c:991'),
- 'pullVolumeSingleAdd': (_equals_one, 0, b'pull', 'pull/volumePull.c:210'),
- 'pullVolumeStackAdd': (_equals_one, 0, b'pull', 'pull/volumePull.c:236'),
- 'pullVolumeLookup': (_equals_null, 0, b'pull', 'pull/volumePull.c:473'),
- 'pullConstraintScaleRange': (_equals_one, 0, b'pull', 'pull/volumePull.c:492'),
- 'pullCCFind': (_equals_one, 0, b'pull', 'pull/ccPull.c:28'),
- 'pullCCMeasure': (_equals_one, 0, b'pull', 'pull/ccPull.c:112'),
- 'pullCCSort': (_equals_one, 0, b'pull', 'pull/ccPull.c:207'),
'pullTraceSet': (_equals_one, 0, b'pull', 'pull/trace.c:243'),
'pullTraceMultiAdd': (_equals_one, 0, b'pull', 'pull/trace.c:672'),
'pullTraceMultiPlotAdd': (_equals_one, 0, b'pull', 'pull/trace.c:702'),
'pullTraceMultiWrite': (_equals_one, 0, b'pull', 'pull/trace.c:1012'),
'pullTraceMultiRead': (_equals_one, 0, b'pull', 'pull/trace.c:1117'),
+ 'pullVolumeSingleAdd': (_equals_one, 0, b'pull', 'pull/volumePull.c:210'),
+ 'pullVolumeStackAdd': (_equals_one, 0, b'pull', 'pull/volumePull.c:236'),
+ 'pullVolumeLookup': (_equals_null, 0, b'pull', 'pull/volumePull.c:473'),
+ 'pullConstraintScaleRange': (_equals_one, 0, b'pull', 'pull/volumePull.c:492'),
'coilStart': (_equals_one, 0, b'coil', 'coil/coreCoil.c:285'),
'coilIterate': (_equals_one, 0, b'coil', 'coil/coreCoil.c:360'),
'coilFinish': (_equals_one, 0, b'coil', 'coil/coreCoil.c:405'),
Modified: teem/trunk/src/_util/gen_biffdata.py
===================================================================
--- teem/trunk/src/_util/gen_biffdata.py 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/src/_util/gen_biffdata.py 2025-09-10 19:32:15 UTC (rev 7399)
@@ -204,23 +204,31 @@
def proc_lib(path_teem: str, lib: str) -> list[str]:
"""
From Teem source checkout at path_teem, for Teem library lib, generate lines of csv data
- about Biff annotations
+ about Biff annotations. This involves reading in the teem/src/<lib>/CMakeLists.txt file
+ to learn what are the .c files that make up the library <lib>.
"""
path_srcs = f'{path_teem}/src/{lib}'
# read the CMakeLists.txt file to get list of source files
+ # NOTE: This requires the "-v2" re-write of the CMakeLists.txt files for Teem v2
+ # (sorry time does not permit writing code to handle both v1 and v2 formats)
with open(f'{path_srcs}/CMakeLists.txt', 'r', encoding='utf8') as cmfile:
- ilines = [line.strip() for line in cmfile.readlines()]
- idx0 = ilines.index(f'set({lib.upper()}_SOURCES')
- idx1 = ilines.index(')')
- filenames = filter(lambda fn: fn.endswith('.c'), ilines[idx0 + 1 : idx1])
+ # read in lines, handling comments now
+ ilines = [line.strip().split('#', 1)[0].strip() for line in cmfile.readlines()]
+ idx0 = ilines.index('SOURCES')
+ # .c filenames, .h private header filenames go between these lines
+ idx1 = ilines.index('PUBLIC_HEADERS')
+ cfiles = []
+ for line in ilines[idx0 + 1 : idx1]:
+ # only keep the .c filenames, not the .h private header filenames
+ cfiles += filter(lambda fn: fn.endswith('.c'), line.split(' '))
olines = []
- for filename in filenames:
+ for cfile in cfiles:
if VERB > 1:
- print(f'... {lib}/{filename}')
- with open(f'{path_srcs}/{filename}', 'r', encoding='utf8') as file:
- olines += proc_src(file, f'{lib}/{filename}')
+ print(f'... {lib}/{cfile}')
+ with open(f'{path_srcs}/{cfile}', 'r', encoding='utf8') as file:
+ olines += proc_src(file, f'{lib}/{cfile}')
if olines:
- olines.insert(0, proc_annote('HEADER', '', '') + ',filename:linenumber')
+ olines.insert(0, proc_annote('HEADER', '', '') + ',cfile:linenumber')
return olines
Modified: teem/trunk/src/air/CMakeLists-v2.txt
===================================================================
--- teem/trunk/src/air/CMakeLists-v2.txt 2025-09-10 17:14:53 UTC (rev 7398)
+++ teem/trunk/src/air/CMakeLists-v2.txt 2025-09-10 19:32:15 UTC (rev 7399)
@@ -1,4 +1,6 @@
_Teem_add_library(${CMAKE_CURRENT_SOURCE_DIR}
+ # NOTE: teem/src/_util/gen_biffdata.py expects both "SOURCES" and "PUBLIC_HEADERS"
+ # to be on lines by themselves (modulo whitespace) as THE way to list all .c files
SOURCES
# list here pasted in from:
# svn status *.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
