Changeset 11671:5470f8740360 in orange


Ignore:
Timestamp:
08/29/13 17:08:16 (8 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
11668:e9b0aaecd76c (diff), 11670:d967a4ceb8b4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged in besser82/orange (pull request #15)

Updated the included LIBLINEAR to version 1.93.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • setup-site.cfg

    r11665 r11671  
    88# 
    99#  * BLAS (a subset) 
    10 #  * LIBSVM (v3.2 - v3.* is required) 
    11 #  * LIBLINEAR (v1.8) 
     10#  * LIBSVM (v3.17 - v3.* is required) 
     11#  * LIBLINEAR (v1.93 - >= 1.9 is preferred, <= 1.8 needs a special cflag) 
     12#  * LINPACK (can be substituted by libR) 
    1213#  * QHull 
    1314#  * R lib (a subset) 
     
    5253# LIBLINEAR configuration 
    5354######################### 
     55# 
     56# If you want to use LIBLINEAR <= 1.8 you will need to add a 
     57# special cflag "-DWITH_API_LIBLINEAR18" to your system's CFLAGS. 
     58# e.g. export CFLAGS="$CFLAGS -DWITH_API_LIBLINEAR18" 
    5459 
    5560[liblinear] 
     
    6570#library_dirs = /usr/lib/R/lib 
    6671 
     72############################## 
     73# LINPACK / libR configuration 
     74############################## 
     75 
     76[R] 
     77#library = R 
     78 
    6779##################### 
    6880# QHull configuration 
  • setup-site.cfg

    r11670 r11671  
    1212#  * LINPACK (can be substituted by libR) 
    1313#  * QHull 
     14#  * R lib (a subset) 
    1415# 
    1516#  You can customize the build process to instead link to the  
     
    2425# multi-threaded blas (or 'goto_blas', 'atlas' etc.) 
    2526# 
    26 #  Currently you still have to set the search paths (for both 
    27 # libraries and header files) using the CFLAGS, CPPFLAGS and  
    28 # LDFLAGS env. variables for compiler and linker to find your 
    29 # library (if not on the default search path). Support for  
    30 # configuring them through this file is planned.  
     27#  You can also specify the header file and library search paths 
     28# using the 'include_dirs = path' and 'library_dirs = path' if they 
     29# are not on the default search paths. 
    3130# 
    3231#  If building and installing with an automated package manager 
     
    4039#################### 
    4140 
    42 [blas]  
     41[blas] 
    4342#library = blas 
    4443 
     
    4948[libsvm] 
    5049#library = svm 
     50#include_dirs = /usr/local/include 
    5151 
    5252######################### 
     
    6060[liblinear] 
    6161#library = linear 
     62#include_dirs = /usr/include 
     63 
     64##################### 
     65# R lib configuration 
     66##################### 
     67 
     68[R] 
     69#library = R 
     70#library_dirs = /usr/lib/R/lib 
    6271 
    6372############################## 
Note: See TracChangeset for help on using the changeset viewer.