Changeset c4ae15 in git


Ignore:
Timestamp:
Jan 21, 2020, 1:09:18 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
b262f1218ae1112aa4dde91dcd16243c0b6acfeef7bb49d030360bfc8da6d513dde525cd9061fc7c
Parents:
9abd6ac1002e12503f4242662b375dddf81dcff01c9d9824e066f96f9c671ab35777b37f9ba9124f
Message:
Merge branch 'MHeymann-machine_learning' into spielwiese
Files:
22 added
5 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r9abd6a rc4ae15  
    117117ylwrap
    118118/resources/singular_resourcesconfig.h
     119__pycache__
     120keywords.txt
     121helpfiles
     122*.npy
     123.coverage
     124*.pyc

  • Singular/dyn_modules/Makefile.am

    r9abd6a rc4ae15  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 SUBDIRS=staticdemo bigintm subsets syzextra pyobject customstd gfanlib python gitfan polymake singmathic Order interval cohomo freealgebra partialgb systhreads loctriv
     3SUBDIRS=staticdemo bigintm subsets syzextra pyobject customstd gfanlib python gitfan polymake singmathic Order interval cohomo freealgebra partialgb systhreads loctriv machinelearning

  • Singular/iparith.cc

    r9abd6a rc4ae15  
    79087908        struct blackbox_list *bb_list = NULL;
    79097909        unsigned nCount = (sArithBase.nCmdUsed-1) / 3;
     7910
    79107911        if ((3*nCount) < sArithBase.nCmdUsed) {
    79117912                nCount++;
    … …  
    79597960                }
    79607961        }
    7961         // free the struct (not the list itself)
     7962        // free the struct (not the list entries itself, which were allocated
     7963        // by strdup)
     7964        omfree(bb_list->list);
    79627965        omfree(bb_list);
    79637966

  • configure.ac

    r9abd6a rc4ae15  
    293293AC_CONFIG_FILES([Singular/dyn_modules/systhreads/Makefile])
    294294AC_CONFIG_FILES([Singular/dyn_modules/loctriv/Makefile])
     295AC_CONFIG_FILES([Singular/dyn_modules/machinelearning/Makefile])
    295296
    296297AC_CONFIG_FILES([Singular/Makefile])

  • m4/options.m4

    r9abd6a rc4ae15  
    418418 AM_CONDITIONAL([SI_BUILTIN_SYSTHREADS], [test x$bi_systhreads = xtrue])
    419419 AM_CONDITIONAL([SI_BUILTIN_LOCTRIV], [test x$bi_loctriv = xtrue])
     420 AM_CONDITIONAL([SI_BUILTIN_MACHINELEARNING], [test x$bi_machinelearning = xtrue])
    420421
    421422 AC_MSG_CHECKING([BUILTIN_LIBS...])
Note: See TracChangeset for help on using the changeset viewer.