zhangyiss/liblbfgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged the patch submitted by Tamas Nepusz to fix some problems on Mac OS X.

Browse Source
This commit is contained in:
Naoaki Okazaki
2010-12-07 23:30:04 +09:00
parent 94854170e7
commit 327d0a5f80
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lbfgs.c
View File

@@ -65,6 +65,7 @@ licence.
#include <config.h>
#endif/*HAVE_CONFIG_H*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -73,7 +74,6 @@ licence.
#ifdef _MSC_VER
#define inline __inline
typedef unsigned int uint32_t;
#endif/*_MSC_VER*/
#if defined(USE_SSE) && defined(__SSE2__) && LBFGS_FLOAT == 64
@@ -290,7 +290,7 @@ int lbfgs(
if (n % 8 != 0) {
return LBFGSERR_INVALID_N_SSE;
}
if (((unsigned short)x & 0x000F) != 0) {
if ((uintptr_t)(const void*)x % 16 == 0) {
return LBFGSERR_INVALID_X_SSE;
}
#endif/*defined(USE_SSE)*/
@@ -490,7 +490,7 @@ int lbfgs(
/* Report the progress. */
if (cd.proc_progress) {
if (ret = cd.proc_progress(cd.instance, x, g, fx, xnorm, gnorm, step, cd.n, k, ls)) {
if ((ret = cd.proc_progress(cd.instance, x, g, fx, xnorm, gnorm, step, cd.n, k, ls))) {
goto lbfgs_exit;
}
}