Changeset 8069:5e19a5dcaac0 in orange


Ignore:
Timestamp:
07/04/11 18:20:26 (3 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
c903263c28d945c0a728dda924299c4c57e7d73e
Message:
 
Location:
source/orange
Files:
8 added
2 edited

Legend:

Unmodified
Added
Removed
  • source/orange/Makefile

    r6522 r8069  
    1111    python ../pyxtract/jitlink_build.py R.so r_imports.hpp 
    1212 
    13 obj/daxpy.o : blas/daxpy.c  
    14     $(CCOMPILER) $(COMPILEOPTIONS) -c blas/daxpy.c  -o obj/daxpy.o 
     13 
     14# TODO: Dont compile BLAS if we can link with system (or user 
     15# supplied) blas 
     16 
     17BLAS_OBJECTS = obj/daxpy.o obj/ddot.o obj/dnrm2.o obj/dscal.o obj/dcopy.o 
    1518     
    16 obj/ddot.o : blas/ddot.c  
    17     $(CCOMPILER) $(COMPILEOPTIONS) -c blas/ddot.c  -o obj/ddot.o 
     19obj/%.o : blas/%.c blas/blas.h blas/blasp.h 
     20    $(CCOMPILER) $(COMPILEOPTIONS) -c $< -o $@ 
    1821 
    19 obj/dnrm2.o : blas/dnrm2.c  
    20     $(CCOMPILER) $(COMPILEOPTIONS) -c blas/dnrm2.c  -o obj/dnrm2.o 
     22LINPACK_OBJECTS = obj/dqrsl.o obj/dqrdc2.o obj/dtrsl.o obj/linpack.o 
    2123 
    22 obj/dscal.o : blas/dscal.c  
    23     $(CCOMPILER) $(COMPILEOPTIONS) -c blas/dscal.c  -o obj/dscal.o 
     24obj/%.o : linpack/%.c linpack/linpack.h 
     25    $(CCOMPILER) $(COMPILEOPTIONS) -c $< -o $@ 
    2426 
    25 BLAS_OBJECTS = obj/daxpy.o obj/ddot.o obj/dnrm2.o obj/dscal.o 
    26  
    27 $(OLD)/orange.so:   ppp/stamp px/stamp $(ORANGE_OBJECTS) $(BLAS_OBJECTS) 
    28     $(LINKER) $(ORANGE_OBJECTS) $(BLAS_OBJECTS) $(LINKOPTIONS) -o $(OLD)/orange.so 
     27$(OLD)/orange.so:   ppp/stamp px/stamp $(ORANGE_OBJECTS) $(BLAS_OBJECTS) $(LINPACK_OBJECTS) 
     28    $(LINKER) $(ORANGE_OBJECTS) $(BLAS_OBJECTS) $(LINPACK_OBJECTS) $(LINKOPTIONS) -o $(OLD)/orange.so 
    2929ifeq ($(OS), Darwin) 
    3030    install_name_tool -id $(DESTDIR)/orange.so $(OLD)/orange.so 
  • source/orange/lib_learner.cpp

    r8063 r8069  
    15031503} 
    15041504 
    1505      
     1505 
     1506/************ EARTH (MARS) ******/ 
     1507#include "earth.hpp" 
     1508 
     1509C_CALL(EarthLearner - Orange.core.EarthLearner, Learner, "([examples], [weight=] -/-> Classifier)") 
     1510C_NAMED(EarthClassifier - Orange.core.EarthClassifier, ClassifierFD, " ") 
     1511 
     1512PyObject *EarthClassifier_formatEarth(PyObject *self, PyObject *args) PYARGS(METH_VARARGS, "() -> None") 
     1513{ 
     1514    PyTRY 
     1515    CAST_TO(TEarthClassifier, classifier); 
     1516    classifier->format_earth(); 
     1517    RETURN_NONE; 
     1518    PyCATCH 
     1519} 
     1520 
    15061521     
    15071522/************* BAYES ************/ 
Note: See TracChangeset for help on using the changeset viewer.