Changeset 64b2fd in git


Ignore:
Timestamp:
Feb 28, 2020, 3:17:21 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
2759ecbd0eea7004185db31ee69c04240e29e6ea
Parents:
f3f5266081df80b1fe68e322c350488db24adf59
Message:
fix: compile without omalloc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/machinelearning/machinelearning.cc

    rf3f526 r64b2fd  
    3939        }
    4040
    41         ml_make_prediction(filename, buffer, lengths, _omStrDup);
     41        ml_make_prediction(filename, buffer, lengths, omStrDup);
    4242
    4343        L->Init(5);
  • libpolys/polys/flint_mpoly.cc

    rf3f526 r64b2fd  
    9898    fmpq_mpoly_clear(a, ctx);
    9999}
    100 
     100#endif
     101
     102#if HAVE_OMALLOC
    101103void convSingPFlintMP(fmpq_mpoly_t res, fmpq_mpoly_ctx_t ctx, poly p, int lp, const ring r)
    102104{
     
    121123  omFreeSize(exp,(r->N+1)*sizeof(ulong));
    122124}
    123 
     125#endif
     126
     127#if HAVE_OMALLOC
    124128poly convFlintMPSingP(fmpq_mpoly_t f, fmpq_mpoly_ctx_t ctx, const ring r)
    125129{
     
    151155  return p;
    152156}
     157#endif
    153158
    154159void convSingPFlintMP(fmpz_mpoly_t res, fmpz_mpoly_ctx_t ctx, poly p, int lp, const ring r)
     
    204209}
    205210
     211#if HAVE_OMALLOC
    206212poly convFlintMPSingP(nmod_mpoly_t f, nmod_mpoly_ctx_t ctx, const ring r)
    207213{
     
    229235  return p;
    230236}
    231 
     237#endif
     238
     239#if HAVE_OMALLOC
    232240void convSingPFlintMP(nmod_mpoly_t res, nmod_mpoly_ctx_t ctx, poly p, int lp,const ring r)
    233241{
     
    248256  omFreeSize(exp,(r->N+1)*sizeof(ulong));
    249257}
    250 
    251 #else
     258#endif
     259
     260#ifndef HAVE_OMALLOC
    252261// memory allocator is thread safe; singular polynomials may be constructed in parallel
    253262
Note: See TracChangeset for help on using the changeset viewer.