Changeset 5015 in /cluster/svnroot


Ignore:
Timestamp:
Mar 1, 2015 1:55:04 PM (6 years ago)
Author:
skylar
Message:

removing FFTW module, adding FFTW test re #903

Location:
bccd-ng/branches/skylar/bccd-3.4.0/trees
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/bin/bccd-test-suite

    r5012 r5015  
    324324    else
    325325        echo "R install FAILED"
     326        RC=$((RC+1))
     327    fi
     328
     329    # FFTW package (#903)
     330    if dpkg -l libfftw3-3 > /dev/null 2>&1 ;
     331        echo "FFTW installed"
     332    else
     333        echo "FFTW install FAILED"
    326334        RC=$((RC+1))
    327335    fi
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/etc/skel/Makefile

    r5011 r5015  
    6767        CFLAGS += -pg
    6868        LDFLAGS += -pg
    69 endif
    70 
    71 #For Modules using FFTW (version 3.3)
    72 ifeq ($(FFTW), 1)
    73         ifeq ($(wildcard /etc/bccd-revision),)   # not the BCCD
    74                 CFLAGS += -I/mounts/al-salam/software/fftw-3.3/include
    75                 LDFLAGS += -L/mounts/al-salam/software/fftw-3.3/lib
    76                 LIBS += -lfftw3f
    77         else                                     # the BCCD
    78                 # this is a placeholder until we build FFTW into a module
    79                 # FLAGS +=
    80                 # LDFLAGS +=
    81                 # LIBS +=
    82         endif
    8369endif
    8470
Note: See TracChangeset for help on using the changeset viewer.